Mercurial > hg > xemacs-beta
annotate src/redisplay.c @ 5593:4218b56833b3
Give the label name when warning or erroring, bytecomp.el
2011-11-02 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-lambda):
Accept a new NAME argument here, have byte-compile-current-form
reflect that if it's specified.
* bytecomp.el (byte-compile-initial-macro-environment):
Specify the label name when byte-compiling it, so warning and
errors are more helpful.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 02 Nov 2011 17:50:39 +0000 |
| parents | 3fde0e346ad7 |
| children | b0d712bbc2a6 |
| rev | line source |
|---|---|
| 428 | 1 /* Display generation from window structure and buffer text. |
| 2 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1995 Free Software Foundation, Inc. | |
|
4928
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2005, 2010 Ben Wing. |
| 428 | 5 Copyright (C) 1995 Sun Microsystems, Inc. |
| 6 Copyright (C) 1996 Chuck Thompson. | |
| 7 | |
| 8 This file is part of XEmacs. | |
| 9 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5198
diff
changeset
|
10 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 11 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5198
diff
changeset
|
12 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5198
diff
changeset
|
13 option) any later version. |
| 428 | 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 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5198
diff
changeset
|
21 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 22 |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 /* Author: Chuck Thompson */ | |
| 26 | |
| 27 /* Fixed up by Ben Wing for Mule */ | |
| 28 | |
| 29 /* This file has been Mule-ized. */ | |
| 30 | |
| 31 /***************************************************************************** | |
| 32 The Golden Rules of Redisplay | |
| 33 | |
| 853 | 34 First: It Is Better To Be Correct Than Fast |
| 35 Second: Thou Shalt Use Due Caution When Running Elisp From Within Redisplay | |
| 36 Third: It Is Better To Be Fast Than Not To Be | |
| 428 | 37 ****************************************************************************/ |
| 38 | |
| 1318 | 39 /* Note: The second rule used to prohibit running Elisp from within |
| 40 redisplay, but that's not correct any more -- use | |
| 41 call*_trapping_problems() or call_with_suspended_errors() instead. | |
| 853 | 42 |
| 43 --ben | |
| 44 */ | |
| 45 | |
| 428 | 46 #include <config.h> |
| 47 #include "lisp.h" | |
| 48 | |
| 49 #include "buffer.h" | |
| 50 #include "commands.h" | |
| 51 #include "debug.h" | |
| 872 | 52 #include "device-impl.h" |
| 428 | 53 #include "elhash.h" |
| 853 | 54 #include "events.h" |
| 872 | 55 #include "extents-impl.h" |
| 428 | 56 #include "faces.h" |
| 872 | 57 #include "frame-impl.h" |
| 428 | 58 #include "glyphs.h" |
| 59 #include "gutter.h" | |
| 60 #include "insdel.h" | |
| 61 #include "menubar.h" | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
5049
diff
changeset
|
62 #include "fontcolor-impl.h" |
| 1318 | 63 #include "opaque.h" |
| 428 | 64 #include "process.h" |
| 1292 | 65 #include "profile.h" |
| 428 | 66 #include "redisplay.h" |
| 67 #include "toolbar.h" | |
| 872 | 68 #include "window-impl.h" |
| 428 | 69 #include "line-number.h" |
| 70 #include "file-coding.h" | |
| 71 | |
| 442 | 72 #include "sysfile.h" |
| 73 | |
| 428 | 74 #ifdef HAVE_TTY |
| 75 #include "console-tty.h" | |
| 76 #endif /* HAVE_TTY */ | |
| 77 | |
| 78 /* Note: We have to be careful throughout this code to properly handle | |
| 867 | 79 and differentiate between Ibytes and Ichars. |
| 80 | |
| 81 Since strings are generally composed of Ibytes, I've taken the tack | |
| 82 that any contiguous set of Ibytes is called a "string", while | |
| 83 any contiguous set of Ichars is called an "array". */ | |
| 428 | 84 |
| 85 /* Return value to indicate a failure by an add_*_rune routine to add | |
| 86 a rune, but no propagation information needs to be returned. */ | |
| 87 #define ADD_FAILED (prop_block_dynarr *) 1 | |
| 88 | |
| 89 #define BEGIN_GLYPHS 0 | |
| 90 #define END_GLYPHS 1 | |
| 91 #define LEFT_GLYPHS 2 | |
| 92 #define RIGHT_GLYPHS 3 | |
| 93 | |
| 94 #define VERTICAL_CLIP(w, display) \ | |
| 442 | 95 ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \ |
| 428 | 96 ? INT_MAX \ |
| 442 | 97 : vertical_clip) |
| 428 | 98 |
| 99 /* The following structures are completely private to redisplay.c so | |
| 100 we put them here instead of in a header file, for modularity. */ | |
| 101 | |
| 826 | 102 /* NOTE: Bytexpos's not Charxpos's in this structure. */ |
| 428 | 103 |
| 104 typedef struct position_redisplay_data_type | |
| 105 { | |
| 106 /* This information is normally filled in by the create_*_block | |
| 107 routines and is used by the add_*_rune routines. */ | |
| 108 Lisp_Object window; | |
| 109 /* if we are working with strings rather than buffers we need a | |
| 110 handle to the string */ | |
| 111 Lisp_Object string; | |
| 112 struct device *d; | |
| 113 struct display_block *db; | |
| 114 struct display_line *dl; | |
| 867 | 115 Ichar ch; /* Character that is to be added. This is |
| 428 | 116 used to communicate this information to |
| 867 | 117 add_ichar_rune(). */ |
| 428 | 118 Lisp_Object last_charset; /* The charset of the previous character. |
| 119 Used to optimize some lookups -- we | |
| 120 only have to do some things when | |
| 121 the charset changes. */ | |
| 122 face_index last_findex; /* The face index of the previous character. | |
| 123 Needed to ensure the validity of the | |
| 124 last_charset optimization. */ | |
| 125 | |
| 126 int last_char_width; /* The width of the previous character. */ | |
| 127 int font_is_bogus; /* If true, it means we couldn't instantiate | |
| 128 the font for this charset, so we substitute | |
| 129 ~'s from the ASCII charset. */ | |
| 826 | 130 Bytexpos byte_charpos; /* Position of character we are processing. This |
| 131 is a Bytexpos, meaning it refers to bytes (not | |
| 132 chars) and can refer to either buffers (1-based) | |
| 133 or strings (0-based). We need to be careful | |
| 134 when doing anything that references the text in | |
| 135 the buffer or string. */ | |
| 136 Bytexpos byte_endpos; /* ????? Unknown, under-used. */ | |
| 428 | 137 int pixpos; |
| 138 int max_pixpos; | |
| 139 int blank_width; /* Width of the blank that is to be added. | |
| 140 This is used to communicate this information | |
| 141 to add_blank_rune(). | |
| 142 | |
| 143 This is also used rather cheesily to | |
| 144 communicate the width of the eol-cursor-size | |
| 145 blank that exists at the end of the line. | |
| 867 | 146 add_ichar_rune() is called cheesily with |
| 428 | 147 the non-printing char '\n', which is stuck |
| 148 in the output routines with its width being | |
| 149 BLANK_WIDTH. */ | |
| 826 | 150 Bytexpos byte_cursor_charpos; /* This stores the buffer position of the |
| 151 cursor. */ | |
| 428 | 152 unsigned int cursor_type :3; |
| 153 int cursor_x; /* rune block cursor is at */ | |
| 154 int start_col; /* Number of character columns (each column has | |
| 155 a width of the default char width) that still | |
| 156 need to be skipped. This is used for horizontal | |
| 157 scrolling, where a certain number of columns | |
| 158 (those off the left side of the screen) need | |
| 159 to be skipped before anything is displayed. */ | |
| 826 | 160 Bytexpos byte_start_col_enabled; |
| 428 | 161 int start_col_xoffset; /* Number of pixels that still need to |
| 4187 | 162 be skipped. This is used for |
| 163 horizontal scrolling of glyphs, where we want | |
| 164 to be able to scroll over part of the glyph. */ | |
| 428 | 165 |
| 166 int hscroll_glyph_width_adjust; /* how much the width of the hscroll | |
| 167 glyph differs from space_width (w). | |
| 168 0 if no hscroll glyph was used, | |
| 169 i.e. the window is not scrolled | |
| 170 horizontally. Used in tab | |
| 171 calculations. */ | |
| 172 | |
| 173 /* Information about the face the text should be displayed in and | |
| 174 any begin-glyphs and end-glyphs. */ | |
| 175 struct extent_fragment *ef; | |
| 176 face_index findex; | |
| 177 | |
| 819 | 178 /* The height of a pixmap may either be predetermined if the user has set a |
| 179 baseline value, or it may be dependent on whatever the line ascent and | |
| 180 descent values end up being, based just on font and pixmap-ascent | |
| 181 information. In the first case we can immediately update the values, thus | |
| 182 their inclusion here. In the last case we cannot determine the actual | |
| 183 contribution to the line height until we have finished laying out all text | |
| 184 on the line. Thus we propagate the max height of such pixmaps and do a | |
| 185 final calculation (in calculate_baseline()) after all text has been added | |
| 186 to the line. */ | |
| 428 | 187 int new_ascent; |
| 188 int new_descent; | |
| 189 int max_pixmap_height; | |
| 819 | 190 int need_baseline_computation; |
| 191 int end_glyph_width; /* Well, it is the kitchen sink after all ... */ | |
| 428 | 192 |
| 193 Lisp_Object result_str; /* String where we put the result of | |
| 194 generating a formatted string in the modeline. */ | |
| 195 int is_modeline; /* Non-zero if we're generating the modeline. */ | |
| 196 Charcount modeline_charpos; /* Number of chars used in result_str so far; | |
| 197 corresponds to bytepos. */ | |
| 198 Bytecount bytepos; /* Number of bytes used in result_str so far. | |
| 4187 | 199 We don't actually copy the bytes into result_str |
| 428 | 200 until the end because we don't know how big the |
| 201 string is going to be until then. */ | |
| 202 } pos_data; | |
| 203 | |
| 204 enum prop_type | |
| 205 { | |
| 206 PROP_STRING, | |
| 207 PROP_CHAR, | |
| 208 PROP_MINIBUF_PROMPT, | |
| 819 | 209 PROP_BLANK, |
| 210 PROP_GLYPH | |
| 428 | 211 }; |
| 212 | |
| 213 /* Data that should be propagated to the next line. Either a single | |
| 867 | 214 Ichar, a string of Ibyte's or a glyph. |
| 428 | 215 |
| 216 The actual data that is propagated ends up as a Dynarr of these | |
| 217 blocks. | |
| 218 | |
| 819 | 219 prop_blocks are used to indicate that data that was supposed to go |
| 220 on the previous line couldn't actually be displayed. Generally this | |
| 221 shouldn't happen if we are clipping the end of lines. If we are | |
| 222 wrapping then we need to display the propagation data before moving | |
| 223 on. Its questionable whether we should wrap or clip glyphs in this | |
| 224 instance. Most e-lisp relies on clipping so we preserve this | |
| 225 behavior. | |
| 226 | |
| 867 | 227 #### It's unclean that both Ichars and Ibytes are here. |
| 428 | 228 */ |
| 229 | |
| 230 typedef struct prop_block prop_block; | |
| 231 struct prop_block | |
| 232 { | |
| 233 enum prop_type type; | |
| 234 | |
| 235 union data | |
| 236 { | |
| 237 struct | |
| 238 { | |
| 867 | 239 Ibyte *str; |
| 428 | 240 Bytecount len; /* length of the string. */ |
| 241 } p_string; | |
| 242 | |
| 243 struct | |
| 244 { | |
| 867 | 245 Ichar ch; |
| 826 | 246 Bytebpos byte_cursor_charpos; /* NOTE: is in Bytebpos's */ |
| 428 | 247 unsigned int cursor_type :3; |
| 248 } p_char; | |
| 249 | |
| 250 struct | |
| 251 { | |
| 252 int width; | |
| 253 face_index findex; | |
| 254 } p_blank; | |
| 819 | 255 |
| 256 struct | |
| 257 { | |
| 258 /* Not used as yet, but could be used to wrap rather than clip glyphs. */ | |
| 4187 | 259 int width; |
| 819 | 260 Lisp_Object glyph; |
| 261 } p_glyph; | |
| 262 | |
| 428 | 263 } data; |
| 264 }; | |
| 265 | |
| 266 typedef struct | |
| 267 { | |
| 268 Dynarr_declare (prop_block); | |
| 269 } prop_block_dynarr; | |
| 270 | |
| 271 | |
| 272 static Charcount generate_fstring_runes (struct window *w, pos_data *data, | |
| 273 Charcount pos, Charcount min_pos, | |
| 274 Charcount max_pos, Lisp_Object elt, | |
| 275 int depth, int max_pixsize, | |
| 438 | 276 face_index findex, int type, |
| 277 Charcount *offset, | |
| 278 Lisp_Object cur_ext); | |
| 428 | 279 static prop_block_dynarr *add_glyph_rune (pos_data *data, |
| 280 struct glyph_block *gb, | |
| 281 int pos_type, int allow_cursor, | |
| 282 struct glyph_cachel *cachel); | |
| 665 | 283 static Bytebpos create_text_block (struct window *w, struct display_line *dl, |
| 826 | 284 Bytebpos byte_start_pos, |
| 285 prop_block_dynarr **prop, | |
| 286 int type); | |
| 428 | 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 redisplay_windows (Lisp_Object window, int skip_selected); | |
| 867 | 295 static void decode_mode_spec (struct window *w, Ichar spec, int type); |
| 428 | 296 static void free_display_line (struct display_line *dl); |
| 826 | 297 static void update_line_start_cache (struct window *w, Charbpos from, |
| 298 Charbpos to, Charbpos point, | |
| 299 int no_regen); | |
| 665 | 300 static int point_visible (struct window *w, Charbpos point, int type); |
| 819 | 301 static void calculate_yoffset (struct display_line *dl, |
| 4187 | 302 struct display_block *fixup); |
| 819 | 303 static void calculate_baseline (pos_data *data); |
| 428 | 304 |
| 1204 | 305 #ifdef ERROR_CHECK_DISPLAY |
| 800 | 306 static void sledgehammer_check_redisplay_structs (void); |
| 1204 | 307 #endif /* ERROR_CHECK_DISPLAY */ |
| 800 | 308 |
| 428 | 309 /* This used to be 10 but 30 seems to give much better performance. */ |
| 310 #define INIT_MAX_PREEMPTS 30 | |
| 1268 | 311 static Fixnum max_preempts; |
| 312 | |
| 313 #define QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION 4 | |
| 428 | 314 |
| 1318 | 315 /* Note that doing this can call Lisp. */ |
| 428 | 316 #define REDISPLAY_PREEMPTION_CHECK \ |
| 317 ((void) \ | |
| 318 (preempted = \ | |
| 319 (!disable_preemption && \ | |
| 320 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \ | |
| 4187 | 321 (!INTERACTIVE || \ |
| 1268 | 322 detect_input_pending (QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION))))) |
| 428 | 323 |
| 324 /* | |
| 325 * Redisplay global variables. | |
| 326 */ | |
| 327 | |
| 328 /* We need a third set of display structures for the cursor motion | |
| 329 routines. We used to just give each window a third set. However, | |
| 330 we always fully regenerate the structures when needed so there | |
| 331 isn't any reason we need more than a single set. */ | |
| 332 display_line_dynarr *cmotion_display_lines; | |
| 333 | |
| 334 /* We store the extents that we need to generate in a Dynarr and then | |
| 335 frob them all on at the end of generating the string. We do it | |
| 336 this way rather than adding them as we generate the string because | |
| 337 we don't store the text into the resulting string until we're done | |
| 338 (to avoid having to resize the string multiple times), and we don't | |
| 339 want to go around adding extents to a string when the extents might | |
| 340 stretch off the end of the string. */ | |
| 341 static EXTENT_dynarr *formatted_string_extent_dynarr; | |
| 342 static Bytecount_dynarr *formatted_string_extent_start_dynarr; | |
| 343 static Bytecount_dynarr *formatted_string_extent_end_dynarr; | |
| 344 | |
| 345 | |
| 346 /* #### probably temporary */ | |
| 458 | 347 Fixnum cache_adjustment; |
| 428 | 348 |
| 349 /* This holds a string representing the text corresponding to a single | |
| 350 modeline % spec. */ | |
| 867 | 351 static Ibyte_dynarr *mode_spec_ibyte_string; |
| 428 | 352 |
| 353 int in_display; /* 1 if in redisplay. */ | |
| 354 | |
| 1318 | 355 /* Whether we should delay size changes. Broken out of |
| 356 enter_redisplay_critical_section(). */ | |
| 357 int hold_frame_size_changes; | |
| 358 | |
| 428 | 359 int disable_preemption; /* Used for debugging redisplay and for |
| 360 force-redisplay. */ | |
| 361 | |
| 362 /* We only allow max_preempts preemptions before we force a redisplay. */ | |
| 363 static int preemption_count; | |
| 364 | |
| 365 /* Minimum pixel height of clipped bottom display line. */ | |
| 458 | 366 Fixnum vertical_clip; |
| 428 | 367 |
| 368 /* Minimum visible pixel width of clipped glyphs at right margin. */ | |
| 458 | 369 Fixnum horizontal_clip; |
| 428 | 370 |
| 371 /* Nonzero means reading single-character input with prompt | |
| 372 so put cursor on minibuffer after the prompt. */ | |
| 373 int cursor_in_echo_area; | |
| 374 Lisp_Object Qcursor_in_echo_area; | |
| 375 | |
| 376 /* Nonzero means truncate lines in all windows less wide than the frame */ | |
| 377 int truncate_partial_width_windows; | |
| 378 | |
| 379 /* non-nil if a buffer has changed since the last time redisplay completed */ | |
| 380 int buffers_changed; | |
| 381 int buffers_changed_set; | |
| 382 | |
| 383 /* non-nil if hscroll has changed somewhere or a buffer has been | |
| 384 narrowed or widened */ | |
| 385 int clip_changed; | |
| 386 int clip_changed_set; | |
| 387 | |
| 388 /* non-nil if any extent has changed since the last time redisplay completed */ | |
| 389 int extents_changed; | |
| 390 int extents_changed_set; | |
| 391 | |
| 392 /* non-nil if any face has changed since the last time redisplay completed */ | |
| 393 int faces_changed; | |
| 394 | |
| 395 /* Nonzero means some frames have been marked as garbaged */ | |
| 396 int frame_changed; | |
| 397 | |
| 398 /* non-zero if any of the builtin display glyphs (continuation, | |
| 399 hscroll, control-arrow, etc) is in need of updating | |
| 400 somewhere. */ | |
| 401 int glyphs_changed; | |
| 402 int glyphs_changed_set; | |
| 403 | |
| 442 | 404 /* non-zero if any subwindow has been deleted. */ |
| 428 | 405 int subwindows_changed; |
| 406 int subwindows_changed_set; | |
| 407 | |
| 408 /* non-zero if any displayed subwindow is in need of updating | |
| 409 somewhere. */ | |
| 410 int subwindows_state_changed; | |
| 411 int subwindows_state_changed_set; | |
| 412 | |
| 413 /* This variable is 1 if the icon has to be updated. | |
| 414 It is set to 1 when `frame-icon-glyph' changes. */ | |
| 415 int icon_changed; | |
| 416 int icon_changed_set; | |
| 417 | |
| 418 /* This variable is 1 if the menubar widget has to be updated. | |
| 419 It is set to 1 by set-menubar-dirty-flag and cleared when the widget | |
| 420 has been updated. */ | |
| 421 int menubar_changed; | |
| 422 int menubar_changed_set; | |
| 423 | |
| 424 /* true iff we should redraw the modelines on the next redisplay */ | |
| 425 int modeline_changed; | |
| 426 int modeline_changed_set; | |
| 427 | |
| 428 /* non-nil if point has changed in some buffer since the last time | |
| 429 redisplay completed */ | |
| 430 int point_changed; | |
| 431 int point_changed_set; | |
| 432 | |
| 433 /* non-nil if some frame has changed its size */ | |
| 434 int size_changed; | |
| 435 | |
| 436 /* non-nil if some device has signaled that it wants to change size */ | |
| 437 int asynch_device_change_pending; | |
| 438 | |
| 439 /* non-nil if any toolbar has changed */ | |
| 440 int toolbar_changed; | |
| 441 int toolbar_changed_set; | |
| 442 | |
| 905 | 443 /* Nonzero if some frame has changed the layout of internal elements |
| 444 (gutters or toolbars). */ | |
| 445 int frame_layout_changed; | |
| 446 | |
| 428 | 447 /* non-nil if any gutter has changed */ |
| 448 int gutter_changed; | |
| 449 int gutter_changed_set; | |
| 450 | |
| 451 /* non-nil if any window has changed since the last time redisplay completed */ | |
| 452 int windows_changed; | |
| 453 | |
| 454 /* non-nil if any frame's window structure has changed since the last | |
| 455 time redisplay completed */ | |
| 456 int windows_structure_changed; | |
| 457 | |
| 458 /* If non-nil, use vertical bar cursor. */ | |
| 459 Lisp_Object Vbar_cursor; | |
| 460 Lisp_Object Qbar_cursor; | |
| 461 | |
| 442 | 462 Lisp_Object Vvisible_bell; /* If true and the terminal will support it |
| 463 then the frame will flash instead of | |
| 464 beeping when an error occurs */ | |
| 428 | 465 |
| 466 /* Nonzero means no need to redraw the entire frame on resuming | |
| 467 a suspended Emacs. This is useful on terminals with multiple pages, | |
| 468 where one page is used for Emacs and another for all else. */ | |
| 469 int no_redraw_on_reenter; | |
| 470 | |
| 3360 | 471 Lisp_Object Vwindow_system; /* #### this variable is deprecated |
| 472 nil or a symbol naming the window system | |
| 428 | 473 under which emacs is running |
| 3360 | 474 (`x', `gtk', `mswindows', and `tty' are |
| 475 supported -- yes, TTYs are window systems | |
| 476 for this purpose. */ | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
477 Lisp_Object Vinitial_device_type; |
| 428 | 478 |
| 479 Lisp_Object Vglobal_mode_string; | |
| 480 | |
| 481 /* The number of lines scroll a window by when point leaves the window; if | |
| 482 it is <=0 then point is centered in the window */ | |
| 458 | 483 Fixnum scroll_step; |
| 428 | 484 |
| 485 /* Scroll up to this many lines, to bring point back on screen. */ | |
| 458 | 486 Fixnum scroll_conservatively; |
| 428 | 487 |
| 488 /* Marker for where to display an arrow on top of the buffer text. */ | |
| 489 Lisp_Object Voverlay_arrow_position; | |
| 490 /* String to display for the arrow. */ | |
| 491 Lisp_Object Voverlay_arrow_string; | |
| 492 | |
| 442 | 493 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook; |
| 494 | |
| 458 | 495 static Fixnum last_display_warning_tick; |
| 496 static Fixnum display_warning_tick; | |
| 428 | 497 Lisp_Object Qdisplay_warning_buffer; |
| 498 int inhibit_warning_display; | |
| 499 | |
| 500 Lisp_Object Vleft_margin_width, Vright_margin_width; | |
| 501 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent; | |
| 502 Lisp_Object Vuse_left_overflow, Vuse_right_overflow; | |
| 503 Lisp_Object Vtext_cursor_visible_p; | |
| 504 | |
| 1292 | 505 static Lisp_Object QSin_redisplay; |
| 506 | |
| 1318 | 507 static Lisp_Object Vpost_redisplay_actions; |
| 508 | |
| 428 | 509 int column_number_start_at_one; |
| 510 | |
| 442 | 511 Lisp_Object Qtop_bottom; |
| 512 | |
| 444 | 513 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset) |
| 428 | 514 |
| 1204 | 515 static const struct memory_description rune_dglyph_description_1[] = { |
| 516 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, glyph) }, | |
| 517 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, extent) }, | |
| 518 { XD_END } | |
| 519 }; | |
| 520 | |
| 521 static const struct sized_memory_description rune_dglyph_description = { | |
| 522 sizeof (struct rune_dglyph), rune_dglyph_description_1 | |
| 523 }; | |
| 524 | |
| 525 static const struct memory_description rune_object_description_1[] = { | |
| 2551 | 526 { XD_BLOCK_ARRAY, RUNE_DGLYPH, 1, { &rune_dglyph_description } }, |
| 1204 | 527 { XD_END } |
| 528 }; | |
| 529 | |
| 530 static const struct sized_memory_description rune_object_description = { | |
| 531 0, rune_object_description_1 | |
| 532 }; | |
| 533 | |
| 534 static const struct memory_description rune_description_1[] = { | |
| 535 { XD_INT, offsetof (rune, type) }, | |
| 536 { XD_UNION, offsetof (rune, object), | |
| 2551 | 537 XD_INDIRECT (0, 0), { &rune_object_description } }, |
| 1204 | 538 { XD_END } |
| 539 }; | |
| 540 | |
| 541 static const struct sized_memory_description rune_description = { | |
| 542 sizeof (rune), | |
| 543 rune_description_1 | |
| 544 }; | |
| 545 | |
| 546 static const struct memory_description rune_dynarr_description_1[] = { | |
| 547 XD_DYNARR_DESC (rune_dynarr, &rune_description), | |
| 548 { XD_END } | |
| 549 }; | |
| 550 | |
| 551 static const struct sized_memory_description rune_dynarr_description = { | |
| 552 sizeof (rune_dynarr), | |
| 553 rune_dynarr_description_1 | |
| 554 }; | |
| 555 | |
| 556 static const struct memory_description display_block_description_1[] = { | |
| 2367 | 557 { XD_BLOCK_PTR, offsetof (display_block, runes), |
| 2551 | 558 1, { &rune_dynarr_description } }, |
| 1204 | 559 { XD_END } |
| 560 }; | |
| 561 | |
| 562 static const struct sized_memory_description display_block_description = { | |
| 563 sizeof (display_block), | |
| 564 display_block_description_1 | |
| 565 }; | |
| 566 | |
| 567 static const struct memory_description display_block_dynarr_description_1[] = { | |
| 568 XD_DYNARR_DESC (display_block_dynarr, &display_block_description), | |
| 569 { XD_END } | |
| 570 }; | |
| 571 | |
| 572 static const struct sized_memory_description display_block_dynarr_description = { | |
| 573 sizeof (display_block_dynarr), | |
| 574 display_block_dynarr_description_1 | |
| 575 }; | |
| 576 | |
| 577 static const struct memory_description glyph_block_description_1[] = { | |
| 578 { XD_LISP_OBJECT, offsetof (glyph_block, glyph) }, | |
| 579 { XD_LISP_OBJECT, offsetof (glyph_block, extent) }, | |
| 580 { XD_END } | |
| 581 }; | |
| 582 | |
| 583 static const struct sized_memory_description glyph_block_description = { | |
| 584 sizeof (glyph_block), | |
| 585 glyph_block_description_1 | |
| 586 }; | |
| 587 | |
| 588 static const struct memory_description glyph_block_dynarr_description_1[] = { | |
| 589 XD_DYNARR_DESC (glyph_block_dynarr, &glyph_block_description), | |
| 590 { XD_END } | |
| 591 }; | |
| 592 | |
| 593 static const struct sized_memory_description glyph_block_dynarr_description = { | |
| 594 sizeof (glyph_block_dynarr), | |
| 595 glyph_block_dynarr_description_1 | |
| 596 }; | |
| 597 | |
| 598 static const struct memory_description display_line_description_1[] = { | |
| 2367 | 599 { XD_BLOCK_PTR, offsetof (display_line, display_blocks), |
| 2551 | 600 1, { &display_block_dynarr_description } }, |
| 2367 | 601 { XD_BLOCK_PTR, offsetof (display_line, left_glyphs), |
| 2551 | 602 1, { &glyph_block_dynarr_description } }, |
| 2367 | 603 { XD_BLOCK_PTR, offsetof (display_line, right_glyphs), |
| 2551 | 604 1, { &glyph_block_dynarr_description } }, |
| 1204 | 605 { XD_END } |
| 606 }; | |
| 607 | |
| 608 static const struct sized_memory_description display_line_description = { | |
| 609 sizeof (display_line), | |
| 610 display_line_description_1 | |
| 611 }; | |
| 612 | |
| 613 static const struct memory_description display_line_dynarr_description_1[] = { | |
| 614 XD_DYNARR_DESC (display_line_dynarr, &display_line_description), | |
| 615 { XD_END } | |
| 616 }; | |
| 617 | |
| 618 const struct sized_memory_description display_line_dynarr_description = { | |
| 619 sizeof (display_line_dynarr), | |
| 620 display_line_dynarr_description_1 | |
| 621 }; | |
| 622 | |
| 428 | 623 |
| 624 /***************************************************************************/ | |
| 625 /* */ | |
| 626 /* low-level interfaces onto device routines */ | |
| 627 /* */ | |
| 628 /***************************************************************************/ | |
| 629 | |
| 630 static int | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
631 redisplay_window_text_width_ichar_string (struct window *w, int findex, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
632 Ichar *str, Charcount len) |
| 428 | 633 { |
| 634 unsigned char charsets[NUM_LEADING_BYTES]; | |
| 635 Lisp_Object window; | |
| 636 | |
| 867 | 637 find_charsets_in_ichar_string (charsets, str, len); |
| 793 | 638 window = wrap_window (w); |
| 428 | 639 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window, |
| 640 charsets); | |
|
4928
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
641 return DEVMETH (WINDOW_XDEVICE (w), |
|
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
642 text_width, (w, WINDOW_FACE_CACHEL (w, findex), str, |
|
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
643 len)); |
| 428 | 644 } |
| 645 | |
| 867 | 646 static Ichar_dynarr *rtw_ichar_dynarr; |
| 428 | 647 |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
648 static int |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
649 redisplay_window_text_width_string (struct window *w, int findex, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
650 Ibyte *nonreloc, Lisp_Object reloc, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
651 Bytecount offset, Bytecount len) |
| 428 | 652 { |
| 867 | 653 if (!rtw_ichar_dynarr) |
| 654 rtw_ichar_dynarr = Dynarr_new (Ichar); | |
| 655 Dynarr_reset (rtw_ichar_dynarr); | |
| 428 | 656 |
| 657 fixup_internal_substring (nonreloc, reloc, offset, &len); | |
| 658 if (STRINGP (reloc)) | |
| 659 nonreloc = XSTRING_DATA (reloc); | |
| 867 | 660 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr); |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
661 return redisplay_window_text_width_ichar_string |
| 4967 | 662 (w, findex, Dynarr_begin (rtw_ichar_dynarr), |
| 867 | 663 Dynarr_length (rtw_ichar_dynarr)); |
| 428 | 664 } |
| 665 | |
| 666 int | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
667 redisplay_text_width_string (Lisp_Object domain, Lisp_Object face, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
668 Ibyte *nonreloc, Lisp_Object reloc, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
669 Bytecount offset, Bytecount len) |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
670 { |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
671 Lisp_Object window = DOMAIN_WINDOW (domain); |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
672 Lisp_Object frame = DOMAIN_FRAME (domain); |
| 428 | 673 unsigned char charsets[NUM_LEADING_BYTES]; |
| 674 struct face_cachel cachel; | |
| 675 | |
| 867 | 676 if (!rtw_ichar_dynarr) |
| 677 rtw_ichar_dynarr = Dynarr_new (Ichar); | |
| 678 Dynarr_reset (rtw_ichar_dynarr); | |
| 428 | 679 |
| 680 fixup_internal_substring (nonreloc, reloc, offset, &len); | |
| 681 if (STRINGP (reloc)) | |
| 682 nonreloc = XSTRING_DATA (reloc); | |
| 867 | 683 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr); |
| 684 find_charsets_in_ibyte_string (charsets, nonreloc, len); | |
| 428 | 685 reset_face_cachel (&cachel); |
| 686 cachel.face = face; | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
687 ensure_face_cachel_complete (&cachel, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
688 NILP (window) ? frame : window, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
689 charsets); |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
690 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (frame))), |
|
4928
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
691 /* #### Not clear if we're always passed a window, but |
|
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
692 I think so. If not, we will get an abort here, |
|
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
693 and then we need to either fix the callers to pass in |
|
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
694 a window, or change *text_width() to take a domain |
|
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
695 argument. */ |
|
ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
Ben Wing <ben@xemacs.org>
parents:
4844
diff
changeset
|
696 text_width, (XWINDOW (window), |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
697 &cachel, |
| 4967 | 698 Dynarr_begin (rtw_ichar_dynarr), |
| 867 | 699 Dynarr_length (rtw_ichar_dynarr))); |
| 428 | 700 } |
| 701 | |
| 702 /* Return the display block from DL of the given TYPE. A display line | |
| 703 can have only one display block of each possible type. If DL does | |
| 704 not have a block of type TYPE, one will be created and added to DL. */ | |
| 705 | |
| 706 struct display_block * | |
| 707 get_display_block_from_line (struct display_line *dl, enum display_type type) | |
| 708 { | |
| 709 int elt; | |
| 710 struct display_block db; | |
| 711 | |
| 712 /* Check if this display line already has a block of the desired type and | |
| 713 if so, return it. */ | |
| 714 if (dl->display_blocks) | |
| 715 { | |
| 716 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++) | |
| 717 { | |
| 718 if (Dynarr_at (dl->display_blocks, elt).type == type) | |
| 719 return Dynarr_atp (dl->display_blocks, elt); | |
| 720 } | |
| 721 | |
| 722 /* There isn't an active block of the desired type, but there | |
| 4187 | 723 might still be allocated blocks we need to reuse. */ |
| 428 | 724 if (elt < Dynarr_largest (dl->display_blocks)) |
| 725 { | |
| 726 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt); | |
| 727 | |
| 3025 | 728 /* "add" the block to the list */ |
| 5038 | 729 Dynarr_incrementr (dl->display_blocks); |
| 428 | 730 |
| 731 /* initialize and return */ | |
| 732 dbp->type = type; | |
| 733 return dbp; | |
| 734 } | |
| 735 } | |
| 736 else | |
| 737 { | |
| 738 /* This line doesn't have any display blocks, so initialize the display | |
| 4187 | 739 bock array. */ |
| 428 | 740 dl->display_blocks = Dynarr_new (display_block); |
| 741 } | |
| 742 | |
| 743 /* The line doesn't have a block of the desired type so go ahead and create | |
| 744 one and add it to the line. */ | |
| 745 xzero (db); | |
| 746 db.type = type; | |
| 747 db.runes = Dynarr_new (rune); | |
| 748 Dynarr_add (dl->display_blocks, db); | |
| 749 | |
| 750 /* Return the newly added display block. */ | |
| 751 elt = Dynarr_length (dl->display_blocks) - 1; | |
| 752 | |
| 753 return Dynarr_atp (dl->display_blocks, elt); | |
| 754 } | |
| 755 | |
| 756 static int | |
| 757 tab_char_width (struct window *w) | |
| 758 { | |
| 759 struct buffer *b = XBUFFER (w->buffer); | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
760 int char_tab_width = XFIXNUM (b->tab_width); |
| 428 | 761 |
| 762 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8; | |
| 763 | |
| 764 return char_tab_width; | |
| 765 } | |
| 766 | |
| 767 static int | |
| 768 space_width (struct window *w) | |
| 769 { | |
| 3659 | 770 /* While tabs are traditionally composed of spaces, for variable-width |
| 428 | 771 fonts the space character tends to give too narrow a value. So |
| 772 we use 'n' instead. Except that we don't. We use the default | |
| 773 character width for the default face. If this is actually | |
| 774 defined by the font then it is probably the best thing to | |
| 775 actually use. If it isn't, we have assumed it is 'n' and have | |
| 776 already calculated its width. Thus we can avoid a call to | |
| 777 XTextWidth on X frames by just querying the default width. */ | |
| 778 return XFONT_INSTANCE | |
| 779 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width; | |
| 780 } | |
| 781 | |
| 782 static int | |
| 783 tab_pix_width (struct window *w) | |
| 784 { | |
| 785 return space_width (w) * tab_char_width (w); | |
| 786 } | |
| 787 | |
| 788 /* Given a pixel position in a window, return the pixel location of | |
| 789 the next tabstop. Tabs are calculated from the left window edge in | |
| 790 terms of spaces displayed in the default face. Formerly the space | |
| 791 width was determined using the currently active face. That method | |
| 792 leads to tabstops which do not line up. */ | |
| 793 | |
| 794 static int | |
| 795 next_tab_position (struct window *w, int start_pixpos, int left_pixpos) | |
| 796 { | |
| 797 int n_pos = left_pixpos; | |
| 798 int pix_tab_width = tab_pix_width (w); | |
| 799 | |
| 800 /* Adjust n_pos for any hscrolling which has happened. */ | |
| 801 if (WINDOW_SCROLLED (w)) | |
| 802 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset; | |
| 803 | |
| 804 while (n_pos <= start_pixpos) | |
| 805 n_pos += pix_tab_width; | |
| 806 | |
| 807 return n_pos; | |
| 808 } | |
| 809 | |
| 810 /* For the given window, calculate the outside and margin boundaries for a | |
| 811 display line. The whitespace boundaries must be calculated by the text | |
| 812 layout routines. */ | |
| 813 | |
| 814 layout_bounds | |
| 815 calculate_display_line_boundaries (struct window *w, int modeline) | |
| 816 { | |
| 817 layout_bounds bounds; | |
| 818 | |
| 819 /* Set the outermost boundaries which are the boundaries of the | |
| 820 window itself minus the gutters (and minus the scrollbars if this | |
| 821 is for the modeline). */ | |
| 822 if (!modeline) | |
| 823 { | |
| 824 bounds.left_out = WINDOW_TEXT_LEFT (w); | |
| 825 bounds.right_out = WINDOW_TEXT_RIGHT (w); | |
| 826 } | |
| 827 else | |
| 828 { | |
| 829 bounds.left_out = WINDOW_MODELINE_LEFT (w); | |
| 830 bounds.right_out = WINDOW_MODELINE_RIGHT (w); | |
| 831 } | |
| 832 | |
| 833 /* The inner boundaries mark where the glyph margins are located. */ | |
| 834 bounds.left_in = bounds.left_out + window_left_margin_width (w); | |
| 835 bounds.right_in = bounds.right_out - window_right_margin_width (w); | |
| 836 | |
| 837 /* We cannot fully calculate the whitespace boundaries as they | |
| 838 depend on the contents of the line being displayed. */ | |
| 839 bounds.left_white = bounds.left_in; | |
| 840 bounds.right_white = bounds.right_in; | |
| 841 | |
| 842 return bounds; | |
| 843 } | |
| 844 | |
| 819 | 845 /* This takes a display_block and its containing line and corrects the yoffset |
| 846 of each glyph in the block to cater for the ascent of the line as a | |
| 847 whole. Must be called *after* the line-ascent is known! */ | |
| 848 | |
| 849 static void | |
| 850 calculate_yoffset (struct display_line *dl, struct display_block *fixup) | |
| 851 { | |
| 852 int i; | |
| 853 for (i=0; i<Dynarr_length (fixup->runes); i++) | |
| 854 { | |
| 855 struct rune *r = Dynarr_atp (fixup->runes,i); | |
| 856 if (r->type == RUNE_DGLYPH) | |
| 4187 | 857 { |
| 858 if (r->object.dglyph.ascent < dl->ascent) | |
| 859 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent + | |
| 819 | 860 r->object.dglyph.descent; |
| 4187 | 861 } |
| 819 | 862 } |
| 863 } | |
| 864 | |
| 865 /* Calculate the textual baseline (the ascent and descent values for the | |
| 866 display_line as a whole). | |
| 867 | |
| 868 If the baseline is completely blank, or contains no manually positioned | |
| 869 glyphs, then the textual baseline is simply the baseline of the default font. | |
| 870 (The `contains no manually positioned glyphs' part is actually done for | |
| 867 | 871 us by `add_ichar_rune'.) |
| 819 | 872 |
| 873 If the baseline contains pixmaps, and they're all manually positioned, then | |
| 874 the textual baseline location is constrained that way, and we need do no | |
| 875 work. | |
| 876 | |
| 877 If the baseline contains pixmaps, and at least one is automatically | |
| 878 positioned, then the textual ascent is the largest ascent on the line, and | |
| 879 the textual descent is the largest descent (which is how things are set up at | |
| 880 entry to this function anyway): except that if the max_ascent + max_descent | |
| 881 is too small for the height of the line (say you've adjusted the baseline of | |
| 882 a short glyph, and there's a tall one next to it), then take the ascent and | |
| 883 descent for the line individually from the largest of the explicitly set | |
| 884 ascent/descent, and the rescaled ascent/descent of the default font, scaled | |
| 885 such that the largest glyph will fit. | |
| 886 | |
| 887 This means that if you have a short glyph (but taller than the default | |
| 888 font's descent) forced right under the baseline, and a really tall | |
| 889 automatically positioned glyph, that the descent for the line is just big | |
| 890 enough for the manually positioned short glyph, and the tall one uses as | |
| 891 much of that space as the default font would were it as tall as the tall | |
| 892 glyph; but that the ascent is big enough for the tall glyph to fit. | |
| 893 | |
| 894 This behaviour means that under no circumstances will changing the baseline | |
| 895 of a short glyph cause a tall glyph to move around; nor will it move the | |
| 896 textual baseline more than necessary. (Changing a tall glyph's baseline | |
| 897 might move the text's baseline arbitrarily, of course.) */ | |
| 898 | |
| 899 static void | |
| 900 calculate_baseline (pos_data *data) | |
| 901 { | |
| 902 /* Blank line: baseline is default font's baseline. */ | |
| 903 | |
| 904 if (!data->new_ascent && !data->new_descent) | |
| 905 { | |
| 906 /* We've got a blank line so initialize these values from the default | |
| 4187 | 907 face. */ |
| 819 | 908 default_face_font_info (data->window, &data->new_ascent, |
| 909 &data->new_descent, 0, 0, 0); | |
| 910 } | |
| 4187 | 911 |
| 819 | 912 /* No automatically positioned glyphs? Return at once. */ |
| 913 if (!data->need_baseline_computation) | |
| 914 return; | |
| 915 | |
| 916 /* Is the tallest glyph on the line automatically positioned? | |
| 917 If it's manually positioned, or it's automatically positioned | |
| 918 and there's enough room for it anyway, we need do no more work. */ | |
| 919 if (data->max_pixmap_height > data->new_ascent + data->new_descent) | |
| 920 { | |
| 921 int default_font_ascent, default_font_descent, default_font_height; | |
| 922 int scaled_default_font_ascent, scaled_default_font_descent; | |
| 4187 | 923 |
| 819 | 924 default_face_font_info (data->window, &default_font_ascent, |
|
5047
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
925 &default_font_descent, 0, &default_font_height, |
|
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
926 0); |
| 819 | 927 |
| 928 scaled_default_font_ascent = data->max_pixmap_height * | |
| 929 default_font_ascent / default_font_height; | |
| 930 | |
| 931 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent); | |
| 932 | |
| 933 /* The ascent may have expanded now. Do we still need to grow the descent, | |
| 4187 | 934 or are things big enough? |
| 935 | |
| 936 The +1 caters for the baseline row itself. */ | |
| 819 | 937 if (data->max_pixmap_height > data->new_ascent + data->new_descent) |
| 4187 | 938 { |
| 939 scaled_default_font_descent = (data->max_pixmap_height * | |
| 819 | 940 default_font_descent / default_font_height) + 1; |
| 941 | |
| 4187 | 942 data->new_descent = max (data->new_descent, scaled_default_font_descent); |
| 943 } | |
| 819 | 944 } |
| 945 } | |
| 946 | |
| 428 | 947 /* Given a display line and a starting position, ensure that the |
| 948 contents of the display line accurately represent the visual | |
| 949 representation of the buffer contents starting from the given | |
| 950 position when displayed in the given window. The display line ends | |
| 951 when the contents of the line reach the right boundary of the given | |
| 952 window. */ | |
| 953 | |
| 665 | 954 static Charbpos |
| 428 | 955 generate_display_line (struct window *w, struct display_line *dl, int bounds, |
| 665 | 956 Charbpos start_pos, prop_block_dynarr **prop, |
| 428 | 957 int type) |
| 958 { | |
| 826 | 959 Charbpos ret_charpos; |
| 428 | 960 int overlay_width; |
| 961 struct buffer *b = XBUFFER (WINDOW_BUFFER (w)); | |
| 962 | |
| 963 /* If our caller hasn't already set the boundaries, then do so now. */ | |
| 964 if (!bounds) | |
| 965 dl->bounds = calculate_display_line_boundaries (w, 0); | |
| 966 | |
| 967 /* Reset what this line is using. */ | |
| 968 if (dl->display_blocks) | |
| 969 Dynarr_reset (dl->display_blocks); | |
| 970 if (dl->left_glyphs) | |
| 971 { | |
| 972 Dynarr_free (dl->left_glyphs); | |
| 973 dl->left_glyphs = 0; | |
| 974 } | |
| 975 if (dl->right_glyphs) | |
| 976 { | |
| 977 Dynarr_free (dl->right_glyphs); | |
| 978 dl->right_glyphs = 0; | |
| 979 } | |
| 980 | |
| 981 /* We aren't generating a modeline at the moment. */ | |
| 982 dl->modeline = 0; | |
| 983 | |
| 984 /* Create a display block for the text region of the line. */ | |
| 985 { | |
| 986 /* #### urk urk urk!!! Chuck fix this shit! */ | |
| 665 | 987 Bytebpos hacked_up_bytebpos = |
| 988 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos), | |
| 428 | 989 prop, type); |
| 826 | 990 if (hacked_up_bytebpos > BYTE_BUF_ZV (b)) |
| 991 ret_charpos = BUF_ZV (b) + 1; | |
| 428 | 992 else |
| 826 | 993 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos); |
| 428 | 994 } |
| 826 | 995 dl->charpos = start_pos; |
| 996 if (dl->end_charpos < dl->charpos) | |
| 997 dl->end_charpos = dl->charpos; | |
| 428 | 998 |
| 999 if (MARKERP (Voverlay_arrow_position) | |
| 1000 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position)) | |
| 1001 && start_pos == marker_position (Voverlay_arrow_position) | |
| 1002 && (STRINGP (Voverlay_arrow_string) | |
| 1003 || GLYPHP (Voverlay_arrow_string))) | |
| 1004 { | |
| 1005 overlay_width = create_overlay_glyph_block (w, dl); | |
| 1006 } | |
| 1007 else | |
| 1008 overlay_width = 0; | |
| 1009 | |
| 1010 /* If there are left glyphs associated with any character in the | |
| 1011 text block, then create a display block to handle them. */ | |
| 1012 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs)) | |
| 1013 create_left_glyph_block (w, dl, overlay_width); | |
| 1014 | |
| 1015 /* If there are right glyphs associated with any character in the | |
| 1016 text block, then create a display block to handle them. */ | |
| 1017 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs)) | |
| 1018 create_right_glyph_block (w, dl); | |
| 1019 | |
| 1020 /* In the future additional types of display blocks may be generated | |
| 1021 here. */ | |
| 1022 | |
| 826 | 1023 w->last_redisplay_pos = ret_charpos; |
| 1024 | |
| 1025 return ret_charpos; | |
| 428 | 1026 } |
| 1027 | |
| 1028 /* Adds an hscroll glyph to a display block. If this is called, then | |
| 1029 the block had better be empty. | |
| 1030 | |
| 1031 Yes, there are multiple places where this function is called but | |
| 1032 that is the way it has to be. Each calling function has to deal | |
| 826 | 1033 with byte_start_col_enabled a little differently depending on the |
| 428 | 1034 object being worked with. */ |
| 1035 | |
| 1036 static prop_block_dynarr * | |
| 1037 add_hscroll_rune (pos_data *data) | |
| 1038 { | |
| 1039 struct glyph_block gb; | |
| 1040 prop_block_dynarr *retval; | |
| 826 | 1041 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos; |
| 647 | 1042 int old_cursor_type = data->cursor_type; |
| 826 | 1043 Bytebpos byte_old_charpos = data->byte_charpos; |
| 428 | 1044 |
| 1045 if (data->cursor_type == CURSOR_ON | |
| 826 | 1046 && data->byte_cursor_charpos >= data->byte_start_col_enabled |
| 1047 && data->byte_cursor_charpos <= data->byte_charpos) | |
| 1048 { | |
| 1049 data->byte_cursor_charpos = data->byte_start_col_enabled; | |
| 428 | 1050 } |
| 1051 else | |
| 1052 { | |
| 1053 data->cursor_type = NO_CURSOR; | |
| 1054 } | |
| 1055 | |
| 826 | 1056 data->byte_endpos = data->byte_charpos; |
| 1057 data->byte_charpos = data->byte_start_col_enabled; | |
| 428 | 1058 |
| 1059 gb.extent = Qnil; | |
| 1060 gb.glyph = Vhscroll_glyph; | |
| 1061 { | |
| 1062 int oldpixpos = data->pixpos; | |
| 442 | 1063 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, |
| 428 | 1064 GLYPH_CACHEL (XWINDOW (data->window), |
| 1065 HSCROLL_GLYPH_INDEX)); | |
| 1066 data->hscroll_glyph_width_adjust = | |
| 1067 data->pixpos - oldpixpos - space_width (XWINDOW (data->window)); | |
| 1068 } | |
| 826 | 1069 data->byte_endpos = 0; |
| 1070 data->byte_cursor_charpos = byte_old_cursor_charpos; | |
| 428 | 1071 data->cursor_type = old_cursor_type; |
| 826 | 1072 data->byte_charpos = byte_old_charpos; |
| 1073 | |
| 1074 data->byte_start_col_enabled = 0; | |
| 428 | 1075 return retval; |
| 1076 } | |
| 1077 | |
| 793 | 1078 /* Adds a character rune to a display block. If there is not enough room |
| 1079 to fit the rune on the display block (as determined by the MAX_PIXPOS) | |
| 1080 then it adds nothing and returns ADD_FAILED. If | |
| 1081 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height | |
| 867 | 1082 to affect the total line height. (See add_ibyte_string_runes()). */ |
| 428 | 1083 |
| 1084 static prop_block_dynarr * | |
| 867 | 1085 add_ichar_rune_1 (pos_data *data, int no_contribute_to_line_height) |
| 428 | 1086 { |
| 1087 struct rune rb, *crb; | |
| 1088 int width, local; | |
| 1089 | |
| 1090 if (data->start_col) | |
| 1091 { | |
| 1092 data->start_col--; | |
| 1093 | |
| 1094 if (data->start_col) | |
| 1095 return NULL; | |
| 1096 } | |
| 1097 | |
| 826 | 1098 if (data->byte_start_col_enabled) |
| 428 | 1099 { |
| 1100 return add_hscroll_rune (data); | |
| 1101 } | |
| 1102 | |
| 1103 if (data->ch == '\n') | |
| 1104 { | |
| 1105 data->font_is_bogus = 0; | |
| 1106 /* Cheesy end-of-line pseudo-character. */ | |
| 1107 width = data->blank_width; | |
| 1108 } | |
| 1109 else | |
| 1110 { | |
| 867 | 1111 Lisp_Object charset = ichar_charset (data->ch); |
| 428 | 1112 if (!EQ (charset, data->last_charset) || |
| 1113 data->findex != data->last_findex) | |
| 1114 { | |
| 1115 /* OK, we need to do things the hard way. */ | |
| 1116 struct window *w = XWINDOW (data->window); | |
| 1117 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex); | |
| 1118 Lisp_Object font_instance = | |
| 1119 ensure_face_cachel_contains_charset (cachel, data->window, | |
| 1120 charset); | |
| 440 | 1121 Lisp_Font_Instance *fi; |
| 428 | 1122 |
| 1123 if (EQ (font_instance, Vthe_null_font_instance)) | |
| 1124 { | |
| 1125 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii); | |
| 1126 data->font_is_bogus = 1; | |
| 1127 } | |
| 1128 else | |
| 1129 data->font_is_bogus = 0; | |
| 1130 | |
| 1131 fi = XFONT_INSTANCE (font_instance); | |
| 771 | 1132 if (!fi->proportional_p || data->font_is_bogus) |
| 1133 { | |
| 867 | 1134 Ichar ch = data->font_is_bogus ? '~' : data->ch; |
| 771 | 1135 |
| 1136 data->last_char_width = | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1137 redisplay_window_text_width_ichar_string |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1138 (XWINDOW (data->window), data->findex, &ch, 1); |
| 771 | 1139 } |
| 428 | 1140 else |
| 1141 data->last_char_width = -1; | |
| 819 | 1142 |
| 793 | 1143 if (!no_contribute_to_line_height) |
| 1144 { | |
| 1145 data->new_ascent = max (data->new_ascent, (int) fi->ascent); | |
| 1146 data->new_descent = max (data->new_descent, (int) fi->descent); | |
| 1147 } | |
| 819 | 1148 |
| 428 | 1149 data->last_charset = charset; |
| 1150 data->last_findex = data->findex; | |
| 1151 } | |
| 1152 | |
| 1153 width = data->last_char_width; | |
| 771 | 1154 if (width < 0) /* proportional fonts */ |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1155 width = redisplay_window_text_width_ichar_string |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1156 (XWINDOW (data->window), data->findex, &data->ch, 1); |
| 428 | 1157 } |
| 1158 | |
| 1159 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos)) | |
| 1160 { | |
| 1161 return ADD_FAILED; | |
| 1162 } | |
| 1163 | |
| 1164 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes)) | |
| 1165 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
1166 crb = Dynarr_past_lastp (data->db->runes); |
| 428 | 1167 local = 0; |
| 1168 } | |
| 1169 else | |
| 1170 { | |
| 1171 crb = &rb; | |
| 1172 local = 1; | |
| 1173 } | |
| 1174 | |
| 1175 crb->findex = data->findex; | |
| 1176 crb->xpos = data->pixpos; | |
| 1177 crb->width = width; | |
| 826 | 1178 if (data->byte_charpos) |
| 428 | 1179 { |
| 1180 if (NILP (data->string)) | |
| 826 | 1181 crb->charpos = |
| 793 | 1182 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER |
| 1183 (XWINDOW (data->window))), | |
| 826 | 1184 data->byte_charpos); |
| 428 | 1185 else |
| 826 | 1186 crb->charpos = |
| 1187 string_index_byte_to_char (data->string, data->byte_charpos); | |
| 428 | 1188 } |
| 1189 else if (data->is_modeline) | |
| 826 | 1190 crb->charpos = data->modeline_charpos; |
| 428 | 1191 else |
| 442 | 1192 /* Text but not in buffer */ |
| 826 | 1193 crb->charpos = 0; |
| 428 | 1194 crb->type = RUNE_CHAR; |
| 1195 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch; | |
| 1196 crb->endpos = 0; | |
| 1197 | |
| 1198 if (data->cursor_type == CURSOR_ON) | |
| 1199 { | |
| 826 | 1200 if (data->byte_charpos == data->byte_cursor_charpos) |
| 428 | 1201 { |
| 1202 crb->cursor_type = CURSOR_ON; | |
| 1203 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1204 } | |
| 1205 else | |
| 1206 crb->cursor_type = CURSOR_OFF; | |
| 1207 } | |
| 1208 else if (data->cursor_type == NEXT_CURSOR) | |
| 1209 { | |
| 1210 crb->cursor_type = CURSOR_ON; | |
| 1211 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1212 data->cursor_type = NO_CURSOR; | |
| 1213 } | |
| 1214 else if (data->cursor_type == IGNORE_CURSOR) | |
| 1215 crb->cursor_type = IGNORE_CURSOR; | |
| 1216 else | |
| 1217 crb->cursor_type = CURSOR_OFF; | |
| 1218 | |
| 1219 if (local) | |
| 1220 Dynarr_add (data->db->runes, *crb); | |
| 1221 else | |
| 5038 | 1222 Dynarr_incrementr (data->db->runes); |
| 428 | 1223 |
| 1224 data->pixpos += width; | |
| 1225 | |
| 1226 return NULL; | |
| 1227 } | |
| 1228 | |
| 793 | 1229 static prop_block_dynarr * |
| 867 | 1230 add_ichar_rune (pos_data *data) |
| 1231 { | |
| 1232 return add_ichar_rune_1 (data, 0); | |
| 1233 } | |
| 1234 | |
| 1235 /* Given a string C_STRING of length C_LENGTH, call add_ichar_rune for | |
| 793 | 1236 each character in the string. Propagate any left-over data unless |
| 1237 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't | |
| 1238 allow this character to increase the total height of the line. (This is | |
| 1239 used when the character is part of a text glyph. In that case, the | |
| 1240 glyph code itself adjusts the line height as necessary, depending on | |
| 1241 whether glyph-contrib-p is true.) */ | |
| 428 | 1242 |
| 1243 static prop_block_dynarr * | |
| 867 | 1244 add_ibyte_string_runes (pos_data *data, Ibyte *c_string, |
| 793 | 1245 Bytecount c_length, int no_prop, |
| 1246 int no_contribute_to_line_height) | |
| 428 | 1247 { |
| 867 | 1248 Ibyte *pos, *end = c_string + c_length; |
| 428 | 1249 prop_block_dynarr *prop; |
| 1250 | |
| 1251 /* #### This function is too simplistic. It needs to do the same | |
| 1252 sort of character interpretation (display-table lookup, | |
| 1253 ctl-arrow checking), etc. that create_text_block() does. | |
| 1254 The functionality to do this in that routine needs to be | |
| 1255 modularized. */ | |
| 1256 | |
| 1257 for (pos = c_string; pos < end;) | |
| 1258 { | |
| 867 | 1259 Ibyte *old_pos = pos; |
| 1260 | |
| 1261 data->ch = itext_ichar (pos); | |
| 1262 | |
| 1263 prop = add_ichar_rune_1 (data, no_contribute_to_line_height); | |
| 428 | 1264 |
| 1265 if (prop) | |
| 1266 { | |
| 1267 if (no_prop) | |
| 1268 return ADD_FAILED; | |
| 1269 else | |
| 1270 { | |
| 1271 struct prop_block pb; | |
| 1272 Bytecount len = end - pos; | |
| 1273 prop = Dynarr_new (prop_block); | |
| 1274 | |
| 1275 pb.type = PROP_STRING; | |
| 867 | 1276 pb.data.p_string.str = xnew_array (Ibyte, len); |
| 4970 | 1277 qxestrncpy (pb.data.p_string.str, pos, len); |
| 428 | 1278 pb.data.p_string.len = len; |
| 1279 | |
| 1280 Dynarr_add (prop, pb); | |
| 1281 return prop; | |
| 1282 } | |
| 1283 } | |
| 867 | 1284 INC_IBYTEPTR (pos); |
| 428 | 1285 assert (pos <= end); |
| 464 | 1286 /* #### Duplicate code from add_string_to_fstring_db_runes |
| 1287 should we do more?*/ | |
| 1288 data->bytepos += pos - old_pos; | |
| 428 | 1289 } |
| 1290 | |
| 1291 return NULL; | |
| 1292 } | |
| 1293 | |
| 1294 /* Add a single rune of the specified width. The area covered by this | |
| 1295 rune will be displayed in the foreground color of the associated | |
| 1296 face. */ | |
| 1297 | |
| 1298 static prop_block_dynarr * | |
| 1299 add_blank_rune (pos_data *data, struct window *w, int char_tab_width) | |
| 1300 { | |
| 1301 struct rune rb; | |
| 1302 | |
| 1303 /* If data->start_col is not 0 then this call to add_blank_rune must have | |
| 1304 been to add it as a tab. */ | |
| 1305 if (data->start_col) | |
| 1306 { | |
| 1307 /* assert (w != NULL) */ | |
| 1308 prop_block_dynarr *retval; | |
| 1309 | |
| 1310 /* If we have still not fully scrolled horizontally, subtract | |
| 4187 | 1311 the width of this tab and return. */ |
| 428 | 1312 if (char_tab_width < data->start_col) |
| 1313 { | |
| 1314 data->start_col -= char_tab_width; | |
| 1315 return NULL; | |
| 1316 } | |
| 1317 else if (char_tab_width == data->start_col) | |
| 1318 data->blank_width = 0; | |
| 1319 else | |
| 1320 { | |
| 1321 int spcwid = space_width (w); | |
| 1322 | |
| 1323 if (spcwid >= data->blank_width) | |
| 1324 data->blank_width = 0; | |
| 1325 else | |
| 1326 data->blank_width -= spcwid; | |
| 1327 } | |
| 1328 | |
| 1329 data->start_col = 0; | |
| 1330 retval = add_hscroll_rune (data); | |
| 1331 | |
| 1332 /* Could be caused by the handling of the hscroll rune. */ | |
| 1333 if (retval != NULL || !data->blank_width) | |
| 1334 return retval; | |
| 1335 } | |
| 1336 | |
| 1337 /* Blank runes are always calculated to fit. */ | |
| 1338 assert (data->pixpos + data->blank_width <= data->max_pixpos); | |
| 1339 | |
| 1340 rb.findex = data->findex; | |
| 1341 rb.xpos = data->pixpos; | |
| 1342 rb.width = data->blank_width; | |
| 826 | 1343 if (data->byte_charpos) |
| 1344 rb.charpos = | |
| 665 | 1345 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))), |
| 826 | 1346 data->byte_charpos); |
| 428 | 1347 else |
| 1348 /* #### and this is really correct too? */ | |
| 826 | 1349 rb.charpos = 0; |
| 428 | 1350 rb.endpos = 0; |
| 1351 rb.type = RUNE_BLANK; | |
| 1352 | |
| 1353 if (data->cursor_type == CURSOR_ON) | |
| 1354 { | |
| 826 | 1355 if (data->byte_charpos == data->byte_cursor_charpos) |
| 428 | 1356 { |
| 1357 rb.cursor_type = CURSOR_ON; | |
| 1358 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1359 } | |
| 1360 else | |
| 1361 rb.cursor_type = CURSOR_OFF; | |
| 1362 } | |
| 1363 else if (data->cursor_type == NEXT_CURSOR) | |
| 1364 { | |
| 1365 rb.cursor_type = CURSOR_ON; | |
| 1366 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1367 data->cursor_type = NO_CURSOR; | |
| 1368 } | |
| 1369 else | |
| 1370 rb.cursor_type = CURSOR_OFF; | |
| 1371 | |
| 1372 Dynarr_add (data->db->runes, rb); | |
| 1373 data->pixpos += data->blank_width; | |
| 1374 | |
| 1375 return NULL; | |
| 1376 } | |
| 1377 | |
| 1378 /* Add runes representing a character in octal. */ | |
| 1379 | |
| 1380 #define ADD_NEXT_OCTAL_RUNE_CHAR do \ | |
| 1381 { \ | |
| 867 | 1382 if (add_failed || (add_failed = add_ichar_rune (data))) \ |
| 428 | 1383 { \ |
| 1384 struct prop_block pb; \ | |
| 1385 if (!prop) \ | |
| 1386 prop = Dynarr_new (prop_block); \ | |
| 1387 \ | |
| 1388 pb.type = PROP_CHAR; \ | |
| 1389 pb.data.p_char.ch = data->ch; \ | |
| 1390 pb.data.p_char.cursor_type = data->cursor_type; \ | |
| 1391 Dynarr_add (prop, pb); \ | |
| 1392 } \ | |
| 1393 } while (0) | |
| 1394 | |
| 1395 static prop_block_dynarr * | |
| 1396 add_octal_runes (pos_data *data) | |
| 1397 { | |
| 819 | 1398 prop_block_dynarr *add_failed, *prop = 0; |
| 867 | 1399 Ichar orig_char = data->ch; |
| 647 | 1400 int orig_cursor_type = data->cursor_type; |
| 428 | 1401 |
| 1402 /* Initialize */ | |
| 1403 add_failed = NULL; | |
| 1404 | |
| 1405 if (data->start_col) | |
| 1406 data->start_col--; | |
| 1407 | |
| 1408 if (!data->start_col) | |
| 1409 { | |
| 826 | 1410 if (data->byte_start_col_enabled) |
| 428 | 1411 { |
| 1412 add_failed = add_hscroll_rune (data); | |
| 1413 } | |
| 1414 else | |
| 1415 { | |
| 1416 struct glyph_block gb; | |
| 1417 struct window *w = XWINDOW (data->window); | |
| 1418 | |
| 1419 gb.extent = Qnil; | |
| 1420 gb.glyph = Voctal_escape_glyph; | |
| 1421 add_failed = | |
| 1422 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1, | |
| 1423 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX)); | |
| 1424 } | |
| 1425 } | |
| 1426 | |
| 1427 /* We only propagate information if the glyph was partially | |
| 1428 added. */ | |
| 1429 if (add_failed) | |
| 1430 return add_failed; | |
| 1431 | |
| 1432 data->cursor_type = IGNORE_CURSOR; | |
| 1433 | |
| 1434 if (data->ch >= 0x100) | |
| 1435 { | |
| 1436 /* If the character is an extended Mule character, it could have | |
| 3498 | 1437 up to 21 bits. For the moment, we treat it as a seven-digit |
| 428 | 1438 octal number. This is not that pretty, but whatever. */ |
| 1439 data->ch = (7 & (orig_char >> 18)) + '0'; | |
| 1440 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1441 | |
| 1442 data->ch = (7 & (orig_char >> 15)) + '0'; | |
| 1443 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1444 | |
| 1445 data->ch = (7 & (orig_char >> 12)) + '0'; | |
| 1446 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1447 | |
| 1448 data->ch = (7 & (orig_char >> 9)) + '0'; | |
| 1449 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1450 } | |
| 1451 | |
| 1452 data->ch = (7 & (orig_char >> 6)) + '0'; | |
| 1453 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1454 | |
| 1455 data->ch = (7 & (orig_char >> 3)) + '0'; | |
| 1456 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1457 | |
| 1458 data->ch = (7 & orig_char) + '0'; | |
| 1459 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1460 | |
| 1461 data->cursor_type = orig_cursor_type; | |
| 819 | 1462 return NULL; |
| 428 | 1463 } |
| 1464 | |
| 1465 #undef ADD_NEXT_OCTAL_RUNE_CHAR | |
| 1466 | |
| 1467 /* Add runes representing a control character to a display block. */ | |
| 1468 | |
| 1469 static prop_block_dynarr * | |
| 1470 add_control_char_runes (pos_data *data, struct buffer *b) | |
| 1471 { | |
| 1472 if (!NILP (b->ctl_arrow)) | |
| 1473 { | |
| 1474 prop_block_dynarr *prop; | |
| 867 | 1475 Ichar orig_char = data->ch; |
| 647 | 1476 int old_cursor_type = data->cursor_type; |
| 428 | 1477 |
| 1478 /* Initialize */ | |
| 1479 prop = NULL; | |
| 1480 | |
| 1481 if (data->start_col) | |
| 1482 data->start_col--; | |
| 1483 | |
| 1484 if (!data->start_col) | |
| 1485 { | |
| 826 | 1486 if (data->byte_start_col_enabled) |
| 428 | 1487 { |
| 1488 prop_block_dynarr *retval; | |
| 1489 | |
| 1490 retval = add_hscroll_rune (data); | |
| 1491 if (retval) | |
| 1492 return retval; | |
| 1493 } | |
| 1494 else | |
| 1495 { | |
| 1496 struct glyph_block gb; | |
| 1497 struct window *w = XWINDOW (data->window); | |
| 1498 | |
| 1499 gb.extent = Qnil; | |
| 1500 gb.glyph = Vcontrol_arrow_glyph; | |
| 1501 | |
| 1502 /* We only propagate information if the glyph was partially | |
| 1503 added. */ | |
| 1504 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1, | |
| 1505 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX))) | |
| 1506 return ADD_FAILED; | |
| 1507 } | |
| 1508 } | |
| 1509 | |
| 1510 if (orig_char == 0177) | |
| 1511 data->ch = '?'; | |
| 1512 else | |
| 1513 data->ch = orig_char ^ 0100; | |
| 1514 data->cursor_type = IGNORE_CURSOR; | |
| 1515 | |
| 867 | 1516 if (add_ichar_rune (data)) |
| 428 | 1517 { |
| 1518 struct prop_block pb; | |
| 1519 if (!prop) | |
| 1520 prop = Dynarr_new (prop_block); | |
| 1521 | |
| 1522 pb.type = PROP_CHAR; | |
| 1523 pb.data.p_char.ch = data->ch; | |
| 1524 pb.data.p_char.cursor_type = data->cursor_type; | |
| 1525 Dynarr_add (prop, pb); | |
| 1526 } | |
| 1527 | |
| 1528 data->cursor_type = old_cursor_type; | |
| 1529 return prop; | |
| 1530 } | |
| 1531 else | |
| 1532 { | |
| 1533 return add_octal_runes (data); | |
| 1534 } | |
| 1535 } | |
| 1536 | |
| 1537 static prop_block_dynarr * | |
| 1538 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry) | |
| 1539 { | |
| 1540 prop_block_dynarr *prop = NULL; | |
| 1541 | |
| 1542 if (STRINGP (entry)) | |
| 1543 { | |
| 867 | 1544 prop = add_ibyte_string_runes (data, |
| 428 | 1545 XSTRING_DATA (entry), |
| 1546 XSTRING_LENGTH (entry), | |
| 793 | 1547 0, 0); |
| 428 | 1548 } |
| 1549 else if (GLYPHP (entry)) | |
| 1550 { | |
| 1551 if (data->start_col) | |
| 1552 data->start_col--; | |
| 1553 | |
| 826 | 1554 if (!data->start_col && data->byte_start_col_enabled) |
| 428 | 1555 { |
| 1556 prop = add_hscroll_rune (data); | |
| 1557 } | |
| 1558 else | |
| 1559 { | |
| 1560 struct glyph_block gb; | |
| 1561 | |
| 1562 gb.glyph = entry; | |
| 1563 gb.extent = Qnil; | |
| 1564 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0); | |
| 1565 } | |
| 1566 } | |
| 1567 else if (CHAR_OR_CHAR_INTP (entry)) | |
| 1568 { | |
| 1569 data->ch = XCHAR_OR_CHAR_INT (entry); | |
| 867 | 1570 prop = add_ichar_rune (data); |
| 428 | 1571 } |
| 1572 else if (CONSP (entry)) | |
| 1573 { | |
| 1574 if (EQ (XCAR (entry), Qformat) | |
| 1575 && CONSP (XCDR (entry)) | |
| 1576 && STRINGP (XCAR (XCDR (entry)))) | |
| 1577 { | |
| 1578 Lisp_Object format = XCAR (XCDR (entry)); | |
| 665 | 1579 Bytebpos len = XSTRING_LENGTH (format); |
| 867 | 1580 Ibyte *src = XSTRING_DATA (format), *end = src + len; |
| 2367 | 1581 Ibyte *result = alloca_ibytes (len); |
| 867 | 1582 Ibyte *dst = result; |
| 428 | 1583 |
| 1584 while (src < end) | |
| 1585 { | |
| 867 | 1586 Ichar c = itext_ichar (src); |
| 1587 INC_IBYTEPTR (src); | |
| 428 | 1588 if (c != '%' || src == end) |
| 867 | 1589 dst += set_itext_ichar (dst, c); |
| 428 | 1590 else |
| 1591 { | |
| 867 | 1592 c = itext_ichar (src); |
| 1593 INC_IBYTEPTR (src); | |
| 428 | 1594 switch (c) |
| 1595 { | |
| 1596 /*case 'x': | |
| 1597 dst += long_to_string_base ((char *)dst, data->ch, 16); | |
| 1598 break;*/ | |
| 1599 case '%': | |
| 867 | 1600 dst += set_itext_ichar (dst, '%'); |
| 428 | 1601 break; |
| 442 | 1602 /* #### unimplemented */ |
| 428 | 1603 } |
| 1604 } | |
| 1605 } | |
| 867 | 1606 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0); |
| 428 | 1607 } |
| 1608 } | |
| 1609 | |
| 1610 /* Else blow it off because someone added a bad entry and we don't | |
| 1611 have any safe way of signaling an error. */ | |
| 1612 return prop; | |
| 1613 } | |
| 1614 | |
| 1615 /* Given a display table entry, call the appropriate functions to | |
| 1616 display each element of the entry. */ | |
| 1617 | |
| 1618 static prop_block_dynarr * | |
| 1619 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry) | |
| 1620 { | |
| 1621 prop_block_dynarr *prop = NULL; | |
| 1622 if (VECTORP (entry)) | |
| 1623 { | |
| 440 | 1624 Lisp_Vector *de = XVECTOR (entry); |
| 428 | 1625 EMACS_INT len = vector_length (de); |
| 1626 int elt; | |
| 1627 | |
| 1628 for (elt = 0; elt < len; elt++) | |
| 1629 { | |
| 1630 if (NILP (vector_data (de)[elt])) | |
| 1631 continue; | |
| 1632 else | |
| 1633 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]); | |
| 1634 /* Else blow it off because someone added a bad entry and we | |
| 1635 don't have any safe way of signaling an error. Hey, this | |
| 1636 comment sounds familiar. */ | |
| 1637 | |
| 1638 /* #### Still need to add any remaining elements to the | |
| 4187 | 1639 propagation information. */ |
| 428 | 1640 if (prop) |
| 1641 return prop; | |
| 1642 } | |
| 1643 } | |
| 1644 else | |
| 1645 prop = add_disp_table_entry_runes_1 (data, entry); | |
| 1646 return prop; | |
| 1647 } | |
| 1648 | |
| 1649 /* Add runes which were propagated from the previous line. */ | |
| 1650 | |
| 1651 static prop_block_dynarr * | |
| 1652 add_propagation_runes (prop_block_dynarr **prop, pos_data *data) | |
| 1653 { | |
| 1654 /* #### Remember to handle start_col parameter of data when the rest of | |
| 1655 this is finished. */ | |
| 1656 /* #### Chuck -- I've redone this function a bit. It looked like the | |
| 1657 case of not all the propagation blocks being added was not handled | |
| 1658 well. */ | |
| 1659 /* #### Chuck -- I also think the double indirection of PROP is kind | |
| 1660 of bogus. A cleaner solution is just to check for | |
| 1661 Dynarr_length (prop) > 0. */ | |
| 1662 /* #### This function also doesn't even pay attention to ADD_FAILED! | |
| 1663 This is seriously fucked! Seven ####'s in 130 lines -- is that a | |
| 1664 record? */ | |
| 1665 int elt; | |
| 1666 prop_block_dynarr *add_failed; | |
| 826 | 1667 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos; |
| 647 | 1668 int old_cursor_type = data->cursor_type; |
| 428 | 1669 |
| 1670 for (elt = 0; elt < Dynarr_length (*prop); elt++) | |
| 1671 { | |
| 1672 struct prop_block *pb = Dynarr_atp (*prop, elt); | |
| 1673 | |
| 1674 switch (pb->type) | |
| 1675 { | |
| 1676 case PROP_CHAR: | |
| 1677 data->ch = pb->data.p_char.ch; | |
| 826 | 1678 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos; |
| 428 | 1679 data->cursor_type = pb->data.p_char.cursor_type; |
| 867 | 1680 add_failed = add_ichar_rune (data); |
| 428 | 1681 |
| 1682 if (add_failed) | |
| 1683 goto oops_no_more_space; | |
| 1684 break; | |
| 1685 case PROP_STRING: | |
| 1686 if (pb->data.p_string.str) | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
1687 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
1688 xfree (pb->data.p_string.str); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
1689 pb->data.p_string.str = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5157
diff
changeset
|
1690 } |
| 428 | 1691 /* #### bogus bogus -- this doesn't do anything! |
| 867 | 1692 Should probably call add_ibyte_string_runes(), |
| 428 | 1693 once that function is fixed. */ |
| 1694 break; | |
| 1695 case PROP_MINIBUF_PROMPT: | |
| 1696 { | |
| 1697 face_index old_findex = data->findex; | |
| 826 | 1698 Bytebpos byte_old_charpos = data->byte_charpos; |
| 428 | 1699 |
| 1700 data->findex = DEFAULT_INDEX; | |
| 826 | 1701 data->byte_charpos = 0; |
| 428 | 1702 data->cursor_type = NO_CURSOR; |
| 1703 | |
| 1704 while (pb->data.p_string.len > 0) | |
| 1705 { | |
| 867 | 1706 data->ch = itext_ichar (pb->data.p_string.str); |
| 1707 add_failed = add_ichar_rune (data); | |
| 428 | 1708 |
| 1709 if (add_failed) | |
| 1710 { | |
| 1711 data->findex = old_findex; | |
| 826 | 1712 data->byte_charpos = byte_old_charpos; |
| 428 | 1713 goto oops_no_more_space; |
| 1714 } | |
| 1715 else | |
| 1716 { | |
| 1717 /* Complicated equivalent of ptr++, len-- */ | |
| 867 | 1718 Ibyte *oldpos = pb->data.p_string.str; |
| 1719 INC_IBYTEPTR (pb->data.p_string.str); | |
| 428 | 1720 pb->data.p_string.len -= pb->data.p_string.str - oldpos; |
| 1721 } | |
| 1722 } | |
| 1723 | |
| 1724 data->findex = old_findex; | |
| 1725 /* ##### FIXME FIXME FIXME -- Upon successful return from | |
| 826 | 1726 this function, data->byte_charpos is automatically incremented. |
| 428 | 1727 However, we don't want that to happen if we were adding |
| 1728 the minibuffer prompt. */ | |
| 1729 { | |
| 1730 struct buffer *buf = | |
| 1731 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))); | |
| 1732 /* #### Chuck fix this shit or I'm gonna scream! */ | |
| 826 | 1733 if (byte_old_charpos > BYTE_BUF_BEGV (buf)) |
| 4187 | 1734 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos); |
| 1735 else | |
| 428 | 1736 /* #### is this correct? Does anyone know? |
| 1737 Does anyone care? Is this a cheesy hack or what? */ | |
| 4187 | 1738 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1; |
| 428 | 1739 } |
| 1740 } | |
| 1741 break; | |
| 1742 case PROP_BLANK: | |
| 1743 { | |
| 1744 /* #### I think it's unnecessary and misleading to preserve | |
| 1745 the blank_width, as it implies that the value carries | |
| 1746 over from one rune to the next, which is wrong. */ | |
| 1747 int old_width = data->blank_width; | |
| 1748 face_index old_findex = data->findex; | |
| 1749 | |
| 1750 data->findex = pb->data.p_blank.findex; | |
| 1751 data->blank_width = pb->data.p_blank.width; | |
| 826 | 1752 data->byte_cursor_charpos = 0; |
| 428 | 1753 data->cursor_type = IGNORE_CURSOR; |
| 1754 | |
| 1755 if (data->pixpos + data->blank_width > data->max_pixpos) | |
| 1756 data->blank_width = data->max_pixpos - data->pixpos; | |
| 1757 | |
| 1758 /* We pass a bogus value of char_tab_width. It shouldn't | |
| 4187 | 1759 matter because unless something is really screwed up |
| 1760 this call won't cause that arg to be used. */ | |
| 428 | 1761 add_failed = add_blank_rune (data, XWINDOW (data->window), 0); |
| 1762 | |
| 1763 /* This can happen in the case where we have a tab which | |
| 4187 | 1764 is wider than the window. */ |
| 428 | 1765 if (data->blank_width != pb->data.p_blank.width) |
| 1766 { | |
| 1767 pb->data.p_blank.width -= data->blank_width; | |
| 1768 add_failed = ADD_FAILED; | |
| 1769 } | |
| 1770 | |
| 1771 data->findex = old_findex; | |
| 1772 data->blank_width = old_width; | |
| 1773 | |
| 1774 if (add_failed) | |
| 1775 goto oops_no_more_space; | |
| 1776 } | |
| 1777 break; | |
| 1778 default: | |
| 2500 | 1779 ABORT (); |
| 428 | 1780 } |
| 1781 } | |
| 1782 | |
| 1783 oops_no_more_space: | |
| 1784 | |
| 826 | 1785 data->byte_cursor_charpos = byte_old_cursor_charpos; |
| 428 | 1786 data->cursor_type = old_cursor_type; |
| 1787 if (elt < Dynarr_length (*prop)) | |
| 1788 { | |
| 1789 Dynarr_delete_many (*prop, 0, elt); | |
| 1790 return *prop; | |
| 1791 } | |
| 1792 else | |
| 1793 { | |
| 1794 Dynarr_free (*prop); | |
| 1795 return NULL; | |
| 1796 } | |
| 1797 } | |
| 1798 | |
| 3025 | 1799 /* Add `text' layout glyphs at position POS_TYPE that are contained to |
| 428 | 1800 the display block, but add all other types to the appropriate list |
| 1801 of the display line. They will be added later by different | |
| 1802 routines. */ | |
| 1803 | |
| 1804 static prop_block_dynarr * | |
| 1805 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type, | |
| 1806 int allow_cursor, struct glyph_cachel *cachel) | |
| 1807 { | |
| 1808 struct window *w = XWINDOW (data->window); | |
| 1809 | |
| 440 | 1810 /* If window faces changed, and glyph instance is text, then |
| 1811 glyph sizes might have changed too */ | |
| 1812 invalidate_glyph_geometry_maybe (gb->glyph, w); | |
| 1813 | |
| 442 | 1814 /* This makes sure the glyph is in the cachels. |
| 1815 | |
| 1816 #### We do this to make sure the glyph is in the glyph cachels, | |
| 1817 so that the dirty flag can be reset after redisplay has | |
| 1818 finished. We should do this some other way, maybe by iterating | |
| 1819 over the window cache of subwindows. */ | |
| 1820 get_glyph_cachel_index (w, gb->glyph); | |
| 1821 | |
| 428 | 1822 /* A nil extent indicates a special glyph (ex. truncator). */ |
| 1823 if (NILP (gb->extent) | |
| 1824 || (pos_type == BEGIN_GLYPHS && | |
| 1825 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT) | |
| 1826 || (pos_type == END_GLYPHS && | |
| 442 | 1827 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT) |
| 1828 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS) | |
| 428 | 1829 { |
| 1830 struct rune rb; | |
| 1831 int width; | |
| 1832 int xoffset = 0; | |
| 1833 int ascent, descent; | |
| 1834 Lisp_Object baseline; | |
| 1835 Lisp_Object face; | |
| 442 | 1836 Lisp_Object instance; |
| 1837 face_index findex; | |
| 819 | 1838 prop_block_dynarr *retval = 0; |
| 428 | 1839 |
| 1840 if (cachel) | |
| 1841 width = cachel->width; | |
| 1842 else | |
| 438 | 1843 width = glyph_width (gb->glyph, data->window); |
| 428 | 1844 |
| 1845 if (!width) | |
| 1846 return NULL; | |
| 1847 | |
| 1848 if (data->start_col || data->start_col_xoffset) | |
| 1849 { | |
| 1850 int glyph_char_width = width / space_width (w); | |
| 1851 | |
| 1852 /* If we still have not fully scrolled horizontally after | |
| 4187 | 1853 taking into account the width of the glyph, subtract its |
| 1854 width and return. */ | |
| 428 | 1855 if (glyph_char_width < data->start_col) |
| 1856 { | |
| 1857 data->start_col -= glyph_char_width; | |
| 1858 return NULL; | |
| 1859 } | |
| 1860 else if (glyph_char_width == data->start_col) | |
| 1861 width = 0; | |
| 1862 else | |
| 1863 { | |
| 1864 xoffset = space_width (w) * data->start_col; | |
| 1865 width -= xoffset; | |
| 1866 | |
| 1867 /* #### Can this happen? */ | |
| 1868 if (width < 0) | |
| 1869 width = 0; | |
| 1870 } | |
| 1871 | |
| 1872 data->start_col = 0; | |
| 1873 retval = add_hscroll_rune (data); | |
| 1874 | |
| 1875 /* Could be caused by the handling of the hscroll rune. */ | |
| 1876 if (retval != NULL || !width) | |
| 1877 return retval; | |
| 1878 } | |
| 1879 else | |
| 1880 xoffset = 0; | |
| 1881 | |
| 1882 if (data->pixpos + width > data->max_pixpos) | |
| 1883 { | |
| 1884 /* If this is the first object we are attempting to add to | |
| 819 | 1885 the line then we ignore the horizontal_clip threshold. |
| 1886 Otherwise we will loop until the bottom of the window | |
| 1887 continually failing to add this glyph because it is wider | |
| 1888 than the window. We could alternatively just completely | |
| 1889 ignore the glyph and proceed from there but I think that | |
| 1890 this is a better solution. | |
| 4187 | 1891 |
| 819 | 1892 This does, however, create a different problem in that we |
| 1893 can end up adding the object to every single line, never | |
| 1894 getting any further - for instance an extent with a long | |
| 1895 start-glyph that covers multitple following | |
| 1896 characters. */ | |
| 428 | 1897 if (Dynarr_length (data->db->runes) |
| 1898 && data->max_pixpos - data->pixpos < horizontal_clip) | |
| 1899 return ADD_FAILED; | |
| 819 | 1900 else { |
| 1901 struct prop_block pb; | |
| 1902 | |
| 1903 /* We need to account for the width of the end-of-line | |
| 1904 glyph if there is nothing more in the line to display, | |
| 1905 since we will not display it in this instance. It seems | |
| 1906 kind of gross doing it here, but otherwise we have to | |
| 1907 search the runes in create_text_block(). */ | |
| 1908 if (data->ch == '\n') | |
| 1909 data->max_pixpos += data->end_glyph_width; | |
| 428 | 1910 width = data->max_pixpos - data->pixpos; |
| 819 | 1911 /* Add the glyph we are displaying, but clipping, to the |
| 1912 propagation data so that we don't try and do it | |
| 4187 | 1913 again. */ |
| 819 | 1914 retval = Dynarr_new (prop_block); |
| 1915 pb.type = PROP_GLYPH; | |
| 1916 pb.data.p_glyph.glyph = gb->glyph; | |
| 1917 pb.data.p_glyph.width = width; | |
| 1918 Dynarr_add (retval, pb); | |
| 1919 } | |
| 428 | 1920 } |
| 1921 | |
| 1922 if (cachel) | |
| 1923 { | |
| 1924 ascent = cachel->ascent; | |
| 1925 descent = cachel->descent; | |
| 1926 } | |
| 1927 else | |
| 1928 { | |
| 438 | 1929 ascent = glyph_ascent (gb->glyph, data->window); |
| 1930 descent = glyph_descent (gb->glyph, data->window); | |
| 428 | 1931 } |
| 1932 | |
| 1933 baseline = glyph_baseline (gb->glyph, data->window); | |
| 1934 | |
| 819 | 1935 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */ |
| 1936 | |
| 428 | 1937 if (glyph_contrib_p (gb->glyph, data->window)) |
| 1938 { | |
| 1939 /* A pixmap that has not had a baseline explicitly set. Its | |
| 1940 contribution will be determined later. */ | |
| 1941 if (NILP (baseline)) | |
| 1942 { | |
| 1943 int height = ascent + descent; | |
| 819 | 1944 data->need_baseline_computation = 1; |
| 428 | 1945 data->max_pixmap_height = max (data->max_pixmap_height, height); |
| 1946 } | |
| 1947 | |
| 1948 /* A string so determine contribution normally. */ | |
| 1949 else if (EQ (baseline, Qt)) | |
| 1950 { | |
| 1951 data->new_ascent = max (data->new_ascent, ascent); | |
| 1952 data->new_descent = max (data->new_descent, descent); | |
| 1953 } | |
| 1954 | |
| 1955 /* A pixmap with an explicitly set baseline. We determine the | |
| 1956 contribution here. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
1957 else if (FIXNUMP (baseline)) |
| 428 | 1958 { |
| 1959 int height = ascent + descent; | |
| 1960 int pix_ascent, pix_descent; | |
| 1961 | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
1962 pix_ascent = height * XFIXNUM (baseline) / 100; |
| 428 | 1963 pix_descent = height - pix_ascent; |
| 1964 | |
| 1965 data->new_ascent = max (data->new_ascent, pix_ascent); | |
| 1966 data->new_descent = max (data->new_descent, pix_descent); | |
| 819 | 1967 data->max_pixmap_height = max (data->max_pixmap_height, height); |
| 4187 | 1968 |
| 819 | 1969 rb.object.dglyph.descent = pix_descent; |
| 428 | 1970 } |
| 1971 | |
| 1972 /* Otherwise something is screwed up. */ | |
| 1973 else | |
| 2500 | 1974 ABORT (); |
| 428 | 1975 } |
| 1976 | |
| 1977 face = glyph_face (gb->glyph, data->window); | |
| 1978 if (NILP (face)) | |
| 442 | 1979 findex = data->findex; |
| 428 | 1980 else |
| 442 | 1981 findex = get_builtin_face_cache_index (w, face); |
| 1982 | |
| 1983 instance = glyph_image_instance (gb->glyph, data->window, | |
| 793 | 1984 ERROR_ME_DEBUG_WARN, 1); |
| 442 | 1985 if (TEXT_IMAGE_INSTANCEP (instance)) |
| 1986 { | |
| 1987 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance); | |
| 1988 face_index orig_findex = data->findex; | |
| 826 | 1989 Bytebpos orig_charpos = data->byte_charpos; |
| 1990 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled; | |
| 442 | 1991 |
| 1992 data->findex = findex; | |
| 826 | 1993 data->byte_start_col_enabled = 0; |
| 442 | 1994 if (!allow_cursor) |
| 826 | 1995 data->byte_charpos = 0; |
| 867 | 1996 add_ibyte_string_runes (data, XSTRING_DATA (string), |
| 793 | 1997 XSTRING_LENGTH (string), 0, 1); |
| 442 | 1998 data->findex = orig_findex; |
| 826 | 1999 data->byte_charpos = orig_charpos; |
| 2000 data->byte_start_col_enabled = orig_start_col_enabled; | |
| 819 | 2001 return retval; |
| 442 | 2002 } |
| 2003 | |
| 2004 rb.findex = findex; | |
| 428 | 2005 rb.xpos = data->pixpos; |
| 2006 rb.width = width; | |
| 826 | 2007 rb.charpos = 0; /* glyphs are never "at" anywhere */ |
| 2008 if (data->byte_endpos) | |
| 428 | 2009 /* #### is this necessary at all? */ |
| 665 | 2010 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)), |
| 826 | 2011 data->byte_endpos); |
| 428 | 2012 else |
| 4187 | 2013 rb.endpos = 0; |
| 428 | 2014 rb.type = RUNE_DGLYPH; |
| 2015 rb.object.dglyph.glyph = gb->glyph; | |
| 2016 rb.object.dglyph.extent = gb->extent; | |
| 2017 rb.object.dglyph.xoffset = xoffset; | |
| 819 | 2018 rb.object.dglyph.ascent = ascent; |
| 2019 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has | |
| 2020 a normal (textual) baseline. */ | |
| 428 | 2021 |
| 2022 if (allow_cursor) | |
| 2023 { | |
| 826 | 2024 rb.charpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)), |
| 2025 data->byte_charpos); | |
| 428 | 2026 |
| 2027 if (data->cursor_type == CURSOR_ON) | |
| 2028 { | |
| 826 | 2029 if (data->byte_charpos == data->byte_cursor_charpos) |
| 428 | 2030 { |
| 2031 rb.cursor_type = CURSOR_ON; | |
| 2032 data->cursor_x = Dynarr_length (data->db->runes); | |
| 2033 } | |
| 2034 else | |
| 2035 rb.cursor_type = CURSOR_OFF; | |
| 2036 } | |
| 2037 else if (data->cursor_type == NEXT_CURSOR) | |
| 2038 { | |
| 2039 rb.cursor_type = CURSOR_ON; | |
| 2040 data->cursor_x = Dynarr_length (data->db->runes); | |
| 2041 data->cursor_type = NO_CURSOR; | |
| 2042 } | |
| 2043 else if (data->cursor_type == IGNORE_CURSOR) | |
| 2044 rb.cursor_type = IGNORE_CURSOR; | |
| 2045 else if (data->cursor_type == NO_CURSOR) | |
| 2046 rb.cursor_type = NO_CURSOR; | |
| 2047 else | |
| 2048 rb.cursor_type = CURSOR_OFF; | |
| 2049 } | |
| 2050 else | |
| 2051 rb.cursor_type = CURSOR_OFF; | |
| 2052 | |
| 2053 Dynarr_add (data->db->runes, rb); | |
| 2054 data->pixpos += width; | |
| 2055 | |
| 819 | 2056 return retval; |
| 428 | 2057 } |
| 2058 else | |
| 2059 { | |
| 2060 if (!NILP (glyph_face (gb->glyph, data->window))) | |
| 2061 gb->findex = | |
| 2062 get_builtin_face_cache_index (w, glyph_face (gb->glyph, | |
| 2063 data->window)); | |
| 2064 else | |
| 2065 gb->findex = data->findex; | |
| 2066 | |
| 2067 if (pos_type == BEGIN_GLYPHS) | |
| 2068 { | |
| 2069 if (!data->dl->left_glyphs) | |
| 2070 data->dl->left_glyphs = Dynarr_new (glyph_block); | |
| 2071 Dynarr_add (data->dl->left_glyphs, *gb); | |
| 2072 return NULL; | |
| 2073 } | |
| 2074 else if (pos_type == END_GLYPHS) | |
| 2075 { | |
| 2076 if (!data->dl->right_glyphs) | |
| 2077 data->dl->right_glyphs = Dynarr_new (glyph_block); | |
| 2078 Dynarr_add (data->dl->right_glyphs, *gb); | |
| 2079 return NULL; | |
| 2080 } | |
| 2081 else | |
| 2500 | 2082 ABORT (); /* there are no unknown types */ |
| 428 | 2083 } |
| 2084 | |
| 819 | 2085 return NULL; |
| 428 | 2086 } |
| 2087 | |
| 2088 /* Add all glyphs at position POS_TYPE that are contained in the given | |
| 2089 data. */ | |
| 2090 | |
| 2091 static prop_block_dynarr * | |
| 2092 add_glyph_runes (pos_data *data, int pos_type) | |
| 2093 { | |
| 2094 /* #### This still needs to handle the start_col parameter. Duh, Chuck, | |
| 2095 why didn't you just modify add_glyph_rune in the first place? */ | |
| 2096 int elt; | |
| 2097 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS | |
| 2098 ? data->ef->begin_glyphs | |
| 2099 : data->ef->end_glyphs); | |
| 2100 prop_block_dynarr *prop; | |
| 2101 | |
| 2102 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++) | |
| 2103 { | |
| 2104 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0, | |
| 2105 0); | |
| 2106 | |
| 2107 if (prop) | |
| 2108 { | |
| 2109 /* #### Add some propagation information. */ | |
| 2110 return prop; | |
| 2111 } | |
| 2112 } | |
| 2113 | |
| 2114 Dynarr_reset (glyph_arr); | |
| 2115 | |
| 2116 return NULL; | |
| 2117 } | |
| 2118 | |
| 2119 /* Given a position for a buffer in a window, ensure that the given | |
| 2120 display line DL accurately represents the text on a line starting | |
| 2121 at the given position. | |
| 2122 | |
| 826 | 2123 NOTE NOTE NOTE NOTE: This function works with and returns Bytebpos's. |
| 428 | 2124 You must do appropriate conversion. */ |
| 2125 | |
| 665 | 2126 static Bytebpos |
| 428 | 2127 create_text_block (struct window *w, struct display_line *dl, |
| 826 | 2128 Bytebpos byte_start_pos, prop_block_dynarr **prop, |
| 428 | 2129 int type) |
| 2130 { | |
| 2131 struct frame *f = XFRAME (w->frame); | |
| 2132 struct buffer *b = XBUFFER (w->buffer); | |
| 2133 struct device *d = XDEVICE (f->device); | |
| 2134 | |
| 2135 pos_data data; | |
| 2136 | |
| 2137 /* Don't display anything in the minibuffer if this window is not on | |
| 2138 a selected frame. We consider all other windows to be active | |
| 2139 minibuffers as it simplifies the coding. */ | |
| 2140 int active_minibuffer = (!MINI_WINDOW_P (w) || | |
| 2141 (f == device_selected_frame (d)) || | |
| 2142 is_surrogate_for_selected_frame (f)); | |
| 2143 | |
| 2144 int truncate_win = window_truncation_on (w); | |
| 2145 | |
| 2146 /* If the buffer's value of selective_display is an integer then | |
| 2147 only lines that start with less than selective_display columns of | |
| 2148 space will be displayed. If selective_display is t then all text | |
| 2149 after a ^M is invisible. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2150 int selective = (FIXNUMP (b->selective_display) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2151 ? XFIXNUM (b->selective_display) |
| 434 | 2152 : (!NILP (b->selective_display) ? -1 : 0)); |
| 428 | 2153 |
| 2154 /* The variable ctl-arrow allows the user to specify what characters | |
| 2155 can actually be displayed and which octal should be used for. | |
| 2156 #### This variable should probably have some rethought done to | |
| 2157 it. | |
| 2158 | |
| 2367 | 2159 See also |
| 2160 | |
| 2161 (Info-goto-node "(internals)Future Work -- Display Tables") | |
| 2162 | |
| 2163 */ | |
| 867 | 2164 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow) |
| 428 | 2165 ? XCHAR_OR_CHAR_INT (b->ctl_arrow) |
| 2166 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil)) | |
| 2167 ? 255 : 160)); | |
| 2168 | |
| 2169 Lisp_Object face_dt, window_dt; | |
| 2170 | |
| 2171 /* The text display block for this display line. */ | |
| 2172 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 2173 | |
| 2174 /* The first time through the main loop we need to force the glyph | |
| 2175 data to be updated. */ | |
| 2176 int initial = 1; | |
| 2177 | |
| 2178 /* Apparently the new extent_fragment_update returns an end position | |
| 2179 equal to the position passed in if there are no more runs to be | |
| 2180 displayed. */ | |
| 2181 int no_more_frags = 0; | |
| 2182 | |
| 2183 Lisp_Object synch_minibuffers_value = | |
| 2184 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer); | |
| 2185 | |
| 2186 dl->used_prop_data = 0; | |
| 2187 dl->num_chars = 0; | |
| 442 | 2188 dl->line_continuation = 0; |
| 428 | 2189 |
| 2190 xzero (data); | |
| 2191 data.ef = extent_fragment_new (w->buffer, f); | |
| 2192 | |
| 2193 /* These values are used by all of the rune addition routines. We add | |
| 2194 them to this structure for ease of passing. */ | |
| 2195 data.d = d; | |
| 793 | 2196 data.window = wrap_window (w); |
| 428 | 2197 data.string = Qnil; |
| 2198 data.db = db; | |
| 2199 data.dl = dl; | |
| 2200 | |
| 826 | 2201 data.byte_charpos = byte_start_pos; |
| 428 | 2202 data.pixpos = dl->bounds.left_in; |
| 2203 data.last_charset = Qunbound; | |
| 2204 data.last_findex = DEFAULT_INDEX; | |
| 2205 data.result_str = Qnil; | |
| 2206 | |
| 2207 /* Set the right boundary adjusting it to take into account any end | |
| 2208 glyph. Save the width of the end glyph for later use. */ | |
| 2209 data.max_pixpos = dl->bounds.right_in; | |
| 2210 if (truncate_win) | |
| 819 | 2211 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX); |
| 428 | 2212 else |
| 819 | 2213 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX); |
| 2214 data.max_pixpos -= data.end_glyph_width; | |
| 428 | 2215 |
| 2216 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f)) | |
| 2217 { | |
| 826 | 2218 data.byte_cursor_charpos = BYTE_BUF_ZV (b); |
| 428 | 2219 data.cursor_type = CURSOR_ON; |
| 2220 } | |
| 2221 else if (MINI_WINDOW_P (w) && !active_minibuffer) | |
| 2222 data.cursor_type = NO_CURSOR; | |
| 2223 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) && | |
| 5198 | 2224 EQ (DEVICE_CONSOLE (d), Vselected_console) && |
| 2225 d == XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d))))&& | |
| 2226 f == XFRAME (DEVICE_SELECTED_FRAME (d))) | |
| 428 | 2227 { |
| 826 | 2228 data.byte_cursor_charpos = BYTE_BUF_PT (b); |
| 428 | 2229 data.cursor_type = CURSOR_ON; |
| 2230 } | |
| 2231 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) | |
| 2232 { | |
| 826 | 2233 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]); |
| 428 | 2234 data.cursor_type = CURSOR_ON; |
| 2235 } | |
| 2236 else | |
| 2237 data.cursor_type = NO_CURSOR; | |
| 2238 data.cursor_x = -1; | |
| 2239 | |
| 2240 data.start_col = w->hscroll; | |
| 2241 data.start_col_xoffset = w->left_xoffset; | |
| 826 | 2242 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0); |
| 428 | 2243 data.hscroll_glyph_width_adjust = 0; |
| 2244 | |
| 2245 /* We regenerate the line from the very beginning. */ | |
| 2246 Dynarr_reset (db->runes); | |
| 2247 | |
| 2248 /* Why is this less than or equal and not just less than? If the | |
| 2249 starting position is already equal to the maximum we can't add | |
| 2250 anything else, right? Wrong. We might still have a newline to | |
| 2251 add. A newline can use the room allocated for an end glyph since | |
| 2252 if we add it we know we aren't going to be adding any end | |
| 2253 glyph. */ | |
| 2254 | |
| 2255 /* #### Chuck -- I think this condition should be while (1). | |
| 2256 Otherwise if (e.g.) there is one begin-glyph and one end-glyph | |
| 2257 and the begin-glyph ends exactly at the end of the window, the | |
| 2258 end-glyph and text might not be displayed. while (1) ensures | |
| 2259 that the loop terminates only when either (a) there is | |
| 2260 propagation data or (b) the end-of-line or end-of-buffer is hit. | |
| 2261 | |
| 2262 #### Also I think you need to ensure that the operation | |
| 2263 "add begin glyphs; add end glyphs; add text" is atomic and | |
| 2264 can't get interrupted in the middle. If you run off the end | |
| 2265 of the line during that operation, then you keep accumulating | |
| 2266 propagation data until you're done. Otherwise, if the (e.g.) | |
| 2267 there's a begin glyph at a particular position and attempting | |
| 2268 to display that glyph results in window-end being hit and | |
| 2269 propagation data being generated, then the character at that | |
| 2270 position won't be displayed. | |
| 2271 | |
| 2272 #### See also the comment after the end of this loop, below. | |
| 2273 */ | |
| 2274 while (data.pixpos <= data.max_pixpos | |
| 2275 && (active_minibuffer || !NILP (synch_minibuffers_value))) | |
| 2276 { | |
| 2277 /* #### This check probably should not be necessary. */ | |
| 826 | 2278 if (data.byte_charpos > BYTE_BUF_ZV (b)) |
| 428 | 2279 { |
| 2280 /* #### urk! More of this lossage! */ | |
| 826 | 2281 data.byte_charpos--; |
| 428 | 2282 goto done; |
| 2283 } | |
| 2284 | |
| 2285 /* If selective display was an integer and we aren't working on | |
| 4187 | 2286 a continuation line then find the next line we are actually |
| 2287 supposed to display. */ | |
| 428 | 2288 if (selective > 0 |
| 826 | 2289 && (data.byte_charpos == BYTE_BUF_BEGV (b) |
| 2290 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n')) | |
| 2291 { | |
| 2292 while (byte_spaces_at_point (b, data.byte_charpos) >= selective) | |
| 428 | 2293 { |
| 826 | 2294 data.byte_charpos = |
| 2295 byte_find_next_newline_no_quit (b, data.byte_charpos, 1); | |
| 2296 if (data.byte_charpos >= BYTE_BUF_ZV (b)) | |
| 428 | 2297 { |
| 826 | 2298 data.byte_charpos = BYTE_BUF_ZV (b); |
| 428 | 2299 goto done; |
| 2300 } | |
| 2301 } | |
| 2302 } | |
| 2303 | |
| 2304 /* Check for face changes. */ | |
| 826 | 2305 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end)) |
| 428 | 2306 { |
| 819 | 2307 Lisp_Object last_glyph = Qnil; |
| 2308 | |
| 2309 /* Deal with glyphs that we have already displayed. The | |
| 2310 theory is that if we end up with a PROP_GLYPH in the | |
| 2311 propagation data then we are clipping the glyph and there | |
| 2312 can be no propagation data before that point. The theory | |
| 2313 works because we always recalculate the extent-fragments | |
| 2314 for propagated data, we never actually propagate the | |
| 2315 fragments that still need to be displayed. */ | |
| 4967 | 2316 if (*prop && Dynarr_begin (*prop)->type == PROP_GLYPH) |
| 2317 { | |
| 2318 last_glyph = Dynarr_begin (*prop)->data.p_glyph.glyph; | |
| 819 | 2319 Dynarr_free (*prop); |
| 2320 *prop = 0; | |
| 2321 } | |
| 428 | 2322 /* Now compute the face and begin/end-glyph information. */ |
| 2323 data.findex = | |
| 665 | 2324 /* Remember that the extent-fragment routines deal in Bytebpos's. */ |
| 826 | 2325 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph); |
| 428 | 2326 |
| 2327 get_display_tables (w, data.findex, &face_dt, &window_dt); | |
| 2328 | |
| 826 | 2329 if (data.byte_charpos == data.ef->end) |
| 428 | 2330 no_more_frags = 1; |
| 2331 } | |
| 2332 initial = 0; | |
| 2333 | |
| 2334 /* Determine what is next to be displayed. We first handle any | |
| 4187 | 2335 glyphs returned by glyphs_at_charbpos. If there are no glyphs to |
| 2336 display then we determine what to do based on the character at the | |
| 2337 current buffer position. */ | |
| 428 | 2338 |
| 2339 /* If the current position is covered by an invisible extent, do | |
| 4187 | 2340 nothing (except maybe add some ellipses). |
| 428 | 2341 |
| 2342 #### The behavior of begin and end-glyphs at the edge of an | |
| 2343 invisible extent should be investigated further. This is | |
| 2344 fairly low priority though. */ | |
| 2345 if (data.ef->invisible) | |
| 2346 { | |
| 2347 /* #### Chuck, perhaps you could look at this code? I don't | |
| 2348 really know what I'm doing. */ | |
| 2349 if (*prop) | |
| 2350 { | |
| 2351 Dynarr_free (*prop); | |
| 2352 *prop = 0; | |
| 2353 } | |
| 2354 | |
| 2355 /* The extent fragment code only sets this when we should | |
| 2356 really display the ellipses. It makes sure the ellipses | |
| 2357 don't get displayed more than once in a row. */ | |
| 2358 if (data.ef->invisible_ellipses) | |
| 2359 { | |
| 2360 struct glyph_block gb; | |
| 2361 | |
| 2362 data.ef->invisible_ellipses_already_displayed = 1; | |
| 2363 data.ef->invisible_ellipses = 0; | |
| 2364 gb.extent = Qnil; | |
| 2365 gb.glyph = Vinvisible_text_glyph; | |
| 2366 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 2367 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 2368 /* Perhaps they shouldn't propagate if the very next thing | |
| 2369 is to display a newline (for compatibility with | |
| 2370 selective-display-ellipses)? Maybe that's too | |
| 2371 abstruse. */ | |
| 2372 if (*prop) | |
| 2373 goto done; | |
| 2374 } | |
| 2375 | |
| 2376 /* If point is in an invisible region we place it on the | |
| 4187 | 2377 next visible character. */ |
| 428 | 2378 if (data.cursor_type == CURSOR_ON |
| 826 | 2379 && data.byte_charpos == data.byte_cursor_charpos) |
| 428 | 2380 { |
| 2381 data.cursor_type = NEXT_CURSOR; | |
| 2382 } | |
| 2383 | |
| 2384 /* #### What if we we're dealing with a display table? */ | |
| 2385 if (data.start_col) | |
| 2386 data.start_col--; | |
| 2387 | |
| 826 | 2388 if (data.byte_charpos == BYTE_BUF_ZV (b)) |
| 428 | 2389 goto done; |
| 2390 else | |
| 826 | 2391 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2392 } |
| 2393 | |
| 2394 /* If there is propagation data, then it represents the current | |
| 819 | 2395 buffer position being displayed. Add them and advance the |
| 2396 position counter. This might also add the minibuffer | |
| 2397 prompt. */ | |
| 428 | 2398 else if (*prop) |
| 2399 { | |
| 2400 dl->used_prop_data = 1; | |
| 2401 *prop = add_propagation_runes (prop, &data); | |
| 2402 | |
| 2403 if (*prop) | |
| 2404 goto done; /* gee, a really narrow window */ | |
| 826 | 2405 else if (data.byte_charpos == BYTE_BUF_ZV (b)) |
| 428 | 2406 goto done; |
| 826 | 2407 else if (data.byte_charpos < BYTE_BUF_BEGV (b)) |
| 428 | 2408 /* #### urk urk urk! Aborts are not very fun! Fix this please! */ |
| 826 | 2409 data.byte_charpos = BYTE_BUF_BEGV (b); |
| 428 | 2410 else |
| 826 | 2411 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2412 } |
| 2413 | |
| 2414 /* If there are end glyphs, add them to the line. These are | |
| 2415 the end glyphs for the previous run of text. We add them | |
| 2416 here rather than doing them at the end of handling the | |
| 2417 previous run so that glyphs at the beginning and end of | |
| 2418 a line are handled correctly. */ | |
| 819 | 2419 else if (Dynarr_length (data.ef->end_glyphs) > 0 |
| 2420 || Dynarr_length (data.ef->begin_glyphs) > 0) | |
| 2421 { | |
| 2422 glyph_block_dynarr* tmpglyphs = 0; | |
| 2423 /* #### I think this is safe, but could be wrong. */ | |
| 826 | 2424 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos); |
| 819 | 2425 |
| 4187 | 2426 if (Dynarr_length (data.ef->end_glyphs) > 0) |
| 819 | 2427 { |
| 2428 *prop = add_glyph_runes (&data, END_GLYPHS); | |
| 2429 tmpglyphs = data.ef->end_glyphs; | |
| 2430 } | |
| 2431 | |
| 2432 /* If there are begin glyphs, add them to the line. */ | |
| 4187 | 2433 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0) |
| 819 | 2434 { |
| 2435 *prop = add_glyph_runes (&data, BEGIN_GLYPHS); | |
| 2436 tmpglyphs = data.ef->begin_glyphs; | |
| 2437 } | |
| 2438 | |
| 4187 | 2439 if (*prop) |
| 819 | 2440 { |
| 2441 /* If we just clipped a glyph and we are at the end of a | |
| 2442 line and there are more glyphs to display then do | |
| 2443 appropriate processing to not get a continuation | |
| 2444 glyph. */ | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2445 if (*prop != ADD_FAILED |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2446 && Dynarr_begin (*prop)->type == PROP_GLYPH |
| 819 | 2447 && data.ch == '\n') |
| 4187 | 2448 { |
| 819 | 2449 /* If there are no more glyphs then do the normal |
| 4187 | 2450 processing. |
| 819 | 2451 |
| 2452 #### This doesn't actually work if the same glyph is | |
| 2453 present more than once in the block. To solve | |
| 2454 this we would have to carry the index around | |
| 2455 which might be problematic since the fragment is | |
| 2456 recalculated for each line. */ | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2457 if (EQ (Dynarr_lastp (tmpglyphs)->glyph, |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2458 Dynarr_begin (*prop)->data.p_glyph.glyph)) |
| 819 | 2459 { |
| 2460 Dynarr_free (*prop); | |
| 2461 *prop = 0; | |
| 2462 } | |
| 2463 else { | |
| 2464 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 867 | 2465 add_ichar_rune (&data); /* discard prop data. */ |
| 819 | 2466 goto done; |
| 2467 } | |
| 2468 } | |
| 2469 else | |
| 2470 goto done; | |
| 2471 } | |
| 428 | 2472 } |
| 2473 | |
| 2474 /* If at end-of-buffer, we've already processed begin and | |
| 2475 end-glyphs at this point and there's no text to process, | |
| 2476 so we're done. */ | |
| 826 | 2477 else if (data.byte_charpos == BYTE_BUF_ZV (b)) |
| 428 | 2478 goto done; |
| 2479 | |
| 2480 else | |
| 2481 { | |
| 2482 Lisp_Object entry = Qnil; | |
| 2483 /* Get the character at the current buffer position. */ | |
| 826 | 2484 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos); |
| 428 | 2485 if (!NILP (face_dt) || !NILP (window_dt)) |
| 2486 entry = display_table_entry (data.ch, face_dt, window_dt); | |
| 2487 | |
| 2488 /* If there is a display table entry for it, hand it off to | |
| 4187 | 2489 add_disp_table_entry_runes and let it worry about it. */ |
| 428 | 2490 if (!NILP (entry) && !EQ (entry, make_char (data.ch))) |
| 2491 { | |
| 2492 *prop = add_disp_table_entry_runes (&data, entry); | |
| 2493 | |
| 2494 if (*prop) | |
| 2495 goto done; | |
| 2496 } | |
| 2497 | |
| 2498 /* Check if we have hit a newline character. If so, add a marker | |
| 4187 | 2499 to the line and end this loop. */ |
| 428 | 2500 else if (data.ch == '\n') |
| 2501 { | |
| 2502 /* We aren't going to be adding an end glyph so give its | |
| 4187 | 2503 space back in order to make sure that the cursor can |
| 2504 fit. */ | |
| 819 | 2505 data.max_pixpos += data.end_glyph_width; |
| 428 | 2506 |
| 2507 if (selective > 0 | |
| 826 | 2508 && (byte_spaces_at_point |
| 2509 (b, next_bytebpos (b, data.byte_charpos)) | |
| 428 | 2510 >= selective)) |
| 2511 { | |
| 2512 if (!NILP (b->selective_display_ellipses)) | |
| 2513 { | |
| 2514 struct glyph_block gb; | |
| 2515 | |
| 2516 gb.extent = Qnil; | |
| 2517 gb.glyph = Vinvisible_text_glyph; | |
| 2518 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 2519 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 2520 } | |
| 2521 else | |
| 2522 { | |
| 2523 /* Cheesy, cheesy, cheesy. We mark the end of the | |
| 2524 line with a special "character rune" whose width | |
| 2525 is the EOL cursor width and whose character is | |
| 2526 the non-printing character '\n'. */ | |
| 2527 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 867 | 2528 *prop = add_ichar_rune (&data); |
| 428 | 2529 } |
| 2530 | |
| 826 | 2531 /* We need to set data.byte_charpos to the start of the |
| 4187 | 2532 next visible region in order to make this line |
| 2533 appear to contain all of the invisible area. | |
| 2534 Otherwise, the line cache won't work | |
| 2535 correctly. */ | |
| 826 | 2536 INC_BYTEBPOS (b, data.byte_charpos); |
| 2537 while (byte_spaces_at_point (b, data.byte_charpos) >= selective) | |
| 428 | 2538 { |
| 826 | 2539 data.byte_charpos = |
| 2540 byte_find_next_newline_no_quit (b, data.byte_charpos, 1); | |
| 2541 if (data.byte_charpos >= BYTE_BUF_ZV (b)) | |
| 428 | 2542 { |
| 826 | 2543 data.byte_charpos = BYTE_BUF_ZV (b); |
| 428 | 2544 break; |
| 2545 } | |
| 2546 } | |
| 826 | 2547 if (BYTE_BUF_FETCH_CHAR |
| 2548 (b, prev_bytebpos (b, data.byte_charpos)) == '\n') | |
| 2549 DEC_BYTEBPOS (b, data.byte_charpos); | |
| 428 | 2550 } |
| 2551 else | |
| 2552 { | |
| 2553 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 867 | 2554 *prop = add_ichar_rune (&data); |
| 428 | 2555 } |
| 2556 | |
| 2557 goto done; | |
| 2558 } | |
| 2559 | |
| 2560 /* If the current character is ^M, and selective display is | |
| 4187 | 2561 enabled, then add the invisible-text-glyph if |
| 2562 selective-display-ellipses is set. In any case, this | |
| 2563 line is done. */ | |
| 428 | 2564 else if (data.ch == (('M' & 037)) && selective == -1) |
| 2565 { | |
| 826 | 2566 Bytebpos byte_next_charpos; |
| 428 | 2567 |
| 2568 /* Find the buffer position at the end of the line. */ | |
| 826 | 2569 byte_next_charpos = |
| 2570 byte_find_next_newline_no_quit (b, data.byte_charpos, 1); | |
| 2571 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos)) | |
| 428 | 2572 == '\n') |
| 826 | 2573 DEC_BYTEBPOS (b, byte_next_charpos); |
| 428 | 2574 |
| 2575 /* If the cursor is somewhere in the elided text make | |
| 4187 | 2576 sure that the cursor gets drawn appropriately. */ |
| 428 | 2577 if (data.cursor_type == CURSOR_ON |
| 826 | 2578 && (data.byte_cursor_charpos >= data.byte_charpos && |
| 2579 data.byte_cursor_charpos < byte_next_charpos)) | |
| 428 | 2580 { |
| 2581 data.cursor_type = NEXT_CURSOR; | |
| 2582 } | |
| 2583 | |
| 2584 /* We won't be adding a truncation or continuation glyph | |
| 4187 | 2585 so give up the room allocated for them. */ |
| 819 | 2586 data.max_pixpos += data.end_glyph_width; |
| 428 | 2587 |
| 2588 if (!NILP (b->selective_display_ellipses)) | |
| 2589 { | |
| 2590 /* We don't propagate anything from the invisible | |
| 4187 | 2591 text glyph if it fails to fit. This is |
| 2592 intentional. */ | |
| 428 | 2593 struct glyph_block gb; |
| 2594 | |
| 2595 gb.extent = Qnil; | |
| 2596 gb.glyph = Vinvisible_text_glyph; | |
| 2597 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, | |
| 2598 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 2599 } | |
| 2600 | |
| 2601 /* Set the buffer position to the end of the line. We | |
| 4187 | 2602 need to do this before potentially adding a newline |
| 2603 so that the cursor flag will get set correctly (if | |
| 2604 needed). */ | |
| 826 | 2605 data.byte_charpos = byte_next_charpos; |
| 428 | 2606 |
| 2607 if (NILP (b->selective_display_ellipses) | |
| 826 | 2608 || data.byte_cursor_charpos == byte_next_charpos) |
| 428 | 2609 { |
| 2610 /* We have to at least add a newline character so | |
| 4187 | 2611 that the cursor shows up properly. */ |
| 428 | 2612 data.ch = '\n'; |
| 2613 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 2614 data.findex = DEFAULT_INDEX; | |
| 2615 data.start_col = 0; | |
| 2616 data.start_col_xoffset = 0; | |
| 826 | 2617 data.byte_start_col_enabled = 0; |
| 428 | 2618 |
| 867 | 2619 add_ichar_rune (&data); |
| 428 | 2620 } |
| 2621 | |
| 2622 /* This had better be a newline but doing it this way | |
| 4187 | 2623 we'll see obvious incorrect results if it isn't. No |
| 2624 need to abort here. */ | |
| 826 | 2625 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos); |
| 428 | 2626 |
| 2627 goto done; | |
| 2628 } | |
| 2629 | |
| 2630 /* If the current character is considered to be printable, then | |
| 4187 | 2631 just add it. */ |
| 428 | 2632 else if (data.ch >= printable_min) |
| 2633 { | |
| 867 | 2634 *prop = add_ichar_rune (&data); |
| 428 | 2635 if (*prop) |
| 2636 goto done; | |
| 2637 } | |
| 2638 | |
| 2639 /* If the current character is a tab, determine the next tab | |
| 4187 | 2640 starting position and add a blank rune which extends from the |
| 2641 current pixel position to that starting position. */ | |
| 428 | 2642 else if (data.ch == '\t') |
| 2643 { | |
| 2644 int tab_start_pixpos = data.pixpos; | |
| 2645 int next_tab_start; | |
| 2646 int char_tab_width; | |
| 2647 int prop_width = 0; | |
| 2648 | |
| 2649 if (data.start_col > 1) | |
| 434 | 2650 tab_start_pixpos -= (space_width (w) * (data.start_col - 1)) |
| 428 | 2651 + data.start_col_xoffset; |
| 2652 | |
| 2653 next_tab_start = | |
| 2654 next_tab_position (w, tab_start_pixpos, | |
| 2655 dl->bounds.left_in + | |
| 2656 data.hscroll_glyph_width_adjust); | |
| 2657 if (next_tab_start > data.max_pixpos) | |
| 2658 { | |
| 2659 prop_width = next_tab_start - data.max_pixpos; | |
| 2660 next_tab_start = data.max_pixpos; | |
| 2661 } | |
| 2662 data.blank_width = next_tab_start - data.pixpos; | |
| 2663 char_tab_width = | |
| 2664 (next_tab_start - tab_start_pixpos) / space_width (w); | |
| 2665 | |
| 2666 *prop = add_blank_rune (&data, w, char_tab_width); | |
| 2667 | |
| 2668 /* add_blank_rune is only supposed to be called with | |
| 4187 | 2669 sizes guaranteed to fit in the available space. */ |
| 428 | 2670 assert (!(*prop)); |
| 2671 | |
| 2672 if (prop_width) | |
| 2673 { | |
| 2674 struct prop_block pb; | |
| 2675 *prop = Dynarr_new (prop_block); | |
| 2676 | |
| 2677 pb.type = PROP_BLANK; | |
| 2678 pb.data.p_blank.width = prop_width; | |
| 2679 pb.data.p_blank.findex = data.findex; | |
| 2680 Dynarr_add (*prop, pb); | |
| 2681 | |
| 2682 goto done; | |
| 2683 } | |
| 2684 } | |
| 2685 | |
| 2686 /* If character is a control character, pass it off to | |
| 4187 | 2687 add_control_char_runes. |
| 428 | 2688 |
| 2689 The is_*() routines have undefined results on | |
| 2690 arguments outside of the range [-1, 255]. (This | |
| 2691 often bites people who carelessly use `char' instead | |
| 2692 of `unsigned char'.) | |
| 2693 */ | |
| 867 | 2694 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch)) |
| 428 | 2695 { |
| 2696 *prop = add_control_char_runes (&data, b); | |
| 2697 | |
| 2698 if (*prop) | |
| 2699 goto done; | |
| 2700 } | |
| 2701 | |
| 2702 /* If the character is above the ASCII range and we have not | |
| 4187 | 2703 already handled it, then print it as an octal number. */ |
| 428 | 2704 else if (data.ch >= 0200) |
| 2705 { | |
| 2706 *prop = add_octal_runes (&data); | |
| 2707 | |
| 2708 if (*prop) | |
| 2709 goto done; | |
| 2710 } | |
| 2711 | |
| 2712 /* Assume the current character is considered to be printable, | |
| 4187 | 2713 then just add it. */ |
| 428 | 2714 else |
| 2715 { | |
| 867 | 2716 *prop = add_ichar_rune (&data); |
| 428 | 2717 if (*prop) |
| 2718 goto done; | |
| 2719 } | |
| 2720 | |
| 826 | 2721 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2722 } |
| 2723 } | |
| 2724 | |
| 2725 done: | |
| 2726 | |
| 2727 /* Determine the starting point of the next line if we did not hit the | |
| 2728 end of the buffer. */ | |
| 826 | 2729 if (data.byte_charpos < BYTE_BUF_ZV (b) |
| 428 | 2730 && (active_minibuffer || !NILP (synch_minibuffers_value))) |
| 2731 { | |
| 2732 /* #### This check is not correct. If the line terminated | |
| 2733 due to a begin-glyph or end-glyph hitting window-end, then | |
| 826 | 2734 data.ch will not point to the character at data.byte_charpos. If |
| 428 | 2735 you make the two changes mentioned at the top of this loop, |
| 2736 you should be able to say '(if (*prop))'. That should also | |
| 826 | 2737 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b) |
| 428 | 2738 check. */ |
| 2739 | |
| 2740 /* The common case is that the line ended because we hit a newline. | |
| 4187 | 2741 In that case, the next character is just the next buffer |
| 2742 position. */ | |
| 428 | 2743 if (data.ch == '\n') |
| 2744 { | |
| 2745 /* If data.start_col_enabled is still true, then the window is | |
| 4187 | 2746 scrolled far enough so that nothing on this line is visible. |
| 2747 We need to stick a truncation glyph at the beginning of the | |
| 2748 line in that case unless the line is completely blank. */ | |
| 826 | 2749 if (data.byte_start_col_enabled) |
| 428 | 2750 { |
| 2751 if (data.cursor_type == CURSOR_ON) | |
| 2752 { | |
| 826 | 2753 if (data.byte_cursor_charpos >= byte_start_pos |
| 2754 && data.byte_cursor_charpos <= data.byte_charpos) | |
| 2755 data.byte_cursor_charpos = data.byte_charpos; | |
| 428 | 2756 } |
| 2757 data.findex = DEFAULT_INDEX; | |
| 2758 data.start_col = 0; | |
| 826 | 2759 data.byte_start_col_enabled = 0; |
| 2760 | |
| 2761 if (data.byte_charpos != byte_start_pos) | |
| 428 | 2762 { |
| 2763 struct glyph_block gb; | |
| 2764 | |
| 2765 gb.extent = Qnil; | |
| 2766 gb.glyph = Vhscroll_glyph; | |
| 2767 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 2768 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX)); | |
| 2769 } | |
| 2770 else | |
| 2771 { | |
| 2772 /* This duplicates code down below to add a newline to | |
| 4187 | 2773 the end of an otherwise empty line.*/ |
| 428 | 2774 data.ch = '\n'; |
| 2775 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 2776 | |
| 867 | 2777 add_ichar_rune (&data); |
| 428 | 2778 } |
| 2779 } | |
| 2780 | |
| 826 | 2781 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2782 } |
| 2783 | |
| 2784 /* Otherwise we have a buffer line which cannot fit on one display | |
| 4187 | 2785 line. */ |
| 428 | 2786 else |
| 2787 { | |
| 2788 struct glyph_block gb; | |
| 2789 struct glyph_cachel *cachel; | |
| 2790 | |
| 2791 /* If the line is to be truncated then we actually have to look | |
| 4187 | 2792 for the next newline. We also add the end-of-line glyph which |
| 2793 we know will fit because we adjusted the right border before | |
| 2794 we starting laying out the line. */ | |
| 819 | 2795 data.max_pixpos += data.end_glyph_width; |
| 428 | 2796 data.findex = DEFAULT_INDEX; |
| 2797 gb.extent = Qnil; | |
| 2798 | |
| 2799 if (truncate_win) | |
| 2800 { | |
| 826 | 2801 Bytebpos byte_pos; |
| 428 | 2802 |
| 2803 /* Now find the start of the next line. */ | |
| 826 | 2804 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1); |
| 428 | 2805 |
| 2806 /* If the cursor is past the truncation line then we | |
| 4187 | 2807 make it appear on the truncation glyph. If we've hit |
| 2808 the end of the buffer then we also make the cursor | |
| 2809 appear unless eob is immediately preceded by a | |
| 2810 newline. In that case the cursor should actually | |
| 2811 appear on the next line. */ | |
| 428 | 2812 if (data.cursor_type == CURSOR_ON |
| 826 | 2813 && data.byte_cursor_charpos >= data.byte_charpos |
| 2814 && (data.byte_cursor_charpos < byte_pos || | |
| 2815 (byte_pos == BYTE_BUF_ZV (b) | |
| 2816 && (byte_pos == BYTE_BUF_BEGV (b) | |
| 2817 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos)) | |
| 428 | 2818 != '\n'))))) |
| 826 | 2819 data.byte_cursor_charpos = byte_pos; |
| 428 | 2820 else |
| 2821 data.cursor_type = NO_CURSOR; | |
| 2822 | |
| 826 | 2823 data.byte_charpos = byte_pos; |
| 428 | 2824 gb.glyph = Vtruncation_glyph; |
| 2825 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX); | |
| 2826 } | |
| 2827 else | |
| 2828 { | |
| 2829 /* The cursor can never be on the continuation glyph. */ | |
| 2830 data.cursor_type = NO_CURSOR; | |
| 2831 | |
| 826 | 2832 /* data.byte_charpos is already at the start of the next line. */ |
| 428 | 2833 |
| 442 | 2834 dl->line_continuation = 1; |
| 428 | 2835 gb.glyph = Vcontinuation_glyph; |
| 2836 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX); | |
| 2837 } | |
| 2838 | |
| 442 | 2839 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel); |
| 428 | 2840 |
| 826 | 2841 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b) |
| 2842 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n') | |
| 428 | 2843 /* #### Damn this losing shit. */ |
| 826 | 2844 data.byte_charpos++; |
| 428 | 2845 } |
| 2846 } | |
| 2847 else if ((active_minibuffer || !NILP (synch_minibuffers_value)) | |
| 826 | 2848 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b))) |
| 428 | 2849 { |
| 2850 /* We need to add a marker to the end of the line since there is no | |
| 4187 | 2851 newline character in order for the cursor to get drawn. We label |
| 2852 it as a newline so that it gets handled correctly by the | |
| 2853 whitespace routines below. */ | |
| 428 | 2854 |
| 2855 data.ch = '\n'; | |
| 2856 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 2857 data.findex = DEFAULT_INDEX; | |
| 2858 data.start_col = 0; | |
| 2859 data.start_col_xoffset = 0; | |
| 826 | 2860 data.byte_start_col_enabled = 0; |
| 428 | 2861 |
| 2862 data.max_pixpos += data.blank_width; | |
| 867 | 2863 add_ichar_rune (&data); |
| 428 | 2864 data.max_pixpos -= data.blank_width; |
| 2865 | |
| 2866 /* #### urk! Chuck, this shit is bad news. Going around | |
| 2867 manipulating invalid positions is guaranteed to result in | |
| 2868 trouble sooner or later. */ | |
| 826 | 2869 data.byte_charpos = BYTE_BUF_ZV (b) + 1; |
| 428 | 2870 } |
| 2871 | |
| 2872 /* Calculate left whitespace boundary. */ | |
| 2873 { | |
| 2874 int elt = 0; | |
| 2875 | |
| 2876 /* Whitespace past a newline is considered right whitespace. */ | |
| 2877 while (elt < Dynarr_length (db->runes)) | |
| 2878 { | |
| 2879 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 2880 | |
| 2881 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ') | |
| 2882 || rb->type == RUNE_BLANK) | |
| 2883 { | |
| 2884 dl->bounds.left_white += rb->width; | |
| 2885 elt++; | |
| 2886 } | |
| 2887 else | |
| 2888 elt = Dynarr_length (db->runes); | |
| 2889 } | |
| 2890 } | |
| 2891 | |
| 2892 /* Calculate right whitespace boundary. */ | |
| 2893 { | |
| 2894 int elt = Dynarr_length (db->runes) - 1; | |
| 2895 int done = 0; | |
| 2896 | |
| 2897 while (!done && elt >= 0) | |
| 2898 { | |
| 2899 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 2900 | |
| 2901 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100 | |
| 2902 && isspace (rb->object.chr.ch)) | |
| 2903 && !rb->type == RUNE_BLANK) | |
| 2904 { | |
| 2905 dl->bounds.right_white = rb->xpos + rb->width; | |
| 2906 done = 1; | |
| 2907 } | |
| 2908 | |
| 2909 elt--; | |
| 2910 | |
| 2911 } | |
| 2912 | |
| 2913 /* The line is blank so everything is considered to be right | |
| 2914 whitespace. */ | |
| 2915 if (!done) | |
| 2916 dl->bounds.right_white = dl->bounds.left_in; | |
| 2917 } | |
| 2918 | |
| 2919 /* Set the display blocks bounds. */ | |
| 2920 db->start_pos = dl->bounds.left_in; | |
| 2921 if (Dynarr_length (db->runes)) | |
| 2922 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2923 struct rune *rb = Dynarr_lastp (db->runes); |
| 428 | 2924 |
| 2925 db->end_pos = rb->xpos + rb->width; | |
| 2926 } | |
| 2927 else | |
| 2928 db->end_pos = dl->bounds.right_white; | |
| 2929 | |
| 819 | 2930 calculate_baseline (&data); |
| 428 | 2931 |
| 2932 dl->ascent = data.new_ascent; | |
| 2933 dl->descent = data.new_descent; | |
| 2934 | |
| 2935 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2936 unsigned short ascent = (unsigned short) XFIXNUM (w->minimum_line_ascent); |
| 428 | 2937 |
| 2938 if (dl->ascent < ascent) | |
| 2939 dl->ascent = ascent; | |
| 2940 } | |
| 2941 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2942 unsigned short descent = (unsigned short) XFIXNUM (w->minimum_line_descent); |
| 428 | 2943 |
| 2944 if (dl->descent < descent) | |
| 2945 dl->descent = descent; | |
| 2946 } | |
| 2947 | |
| 819 | 2948 calculate_yoffset (dl, db); |
| 2949 | |
| 428 | 2950 dl->cursor_elt = data.cursor_x; |
| 2951 /* #### lossage lossage lossage! Fix this shit! */ | |
| 826 | 2952 if (data.byte_charpos > BYTE_BUF_ZV (b)) |
| 2953 dl->end_charpos = BUF_ZV (b); | |
| 428 | 2954 else |
| 826 | 2955 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1; |
| 428 | 2956 if (truncate_win) |
| 826 | 2957 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0); |
| 428 | 2958 else |
| 2959 /* This doesn't correctly take into account tabs and control | |
| 2960 characters but if the window isn't being truncated then this | |
| 2961 value isn't going to end up being used anyhow. */ | |
| 826 | 2962 data.dl->num_chars = dl->end_charpos - dl->charpos; |
| 428 | 2963 |
| 2964 /* #### handle horizontally scrolled line with text none of which | |
| 2965 was actually laid out. */ | |
| 2966 | |
| 2967 /* #### handle any remainder of overlay arrow */ | |
| 2968 | |
| 2969 if (*prop == ADD_FAILED) | |
| 2970 *prop = NULL; | |
| 2971 | |
| 2972 if (truncate_win && *prop) | |
| 2973 { | |
| 2974 Dynarr_free (*prop); | |
| 2975 *prop = NULL; | |
| 2976 } | |
| 2977 | |
| 2978 extent_fragment_delete (data.ef); | |
| 2979 | |
| 2980 /* #### If we started at EOB, then make sure we return a value past | |
| 2981 it so that regenerate_window will exit properly. This is bogus. | |
| 2982 The main loop should get fixed so that it isn't necessary to call | |
| 2983 this function if we are already at EOB. */ | |
| 2984 | |
| 826 | 2985 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b)) |
| 2986 return data.byte_charpos + 1; /* Yuck! */ | |
| 428 | 2987 else |
| 826 | 2988 return data.byte_charpos; |
| 428 | 2989 } |
| 2990 | |
| 2991 /* Display the overlay arrow at the beginning of the given line. */ | |
| 2992 | |
| 2993 static int | |
| 2994 create_overlay_glyph_block (struct window *w, struct display_line *dl) | |
| 2995 { | |
| 2996 struct frame *f = XFRAME (w->frame); | |
| 2997 struct device *d = XDEVICE (f->device); | |
| 2998 pos_data data; | |
| 2999 | |
| 3000 /* If Voverlay_arrow_string isn't valid then just fail silently. */ | |
| 3001 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string)) | |
| 3002 return 0; | |
| 3003 | |
| 3004 xzero (data); | |
| 3005 data.ef = NULL; | |
| 3006 data.d = d; | |
| 793 | 3007 data.window = wrap_window (w); |
| 428 | 3008 data.db = get_display_block_from_line (dl, OVERWRITE); |
| 3009 data.dl = dl; | |
| 3010 data.pixpos = dl->bounds.left_in; | |
| 3011 data.max_pixpos = dl->bounds.right_in; | |
| 3012 data.cursor_type = NO_CURSOR; | |
| 3013 data.cursor_x = -1; | |
| 3014 data.findex = DEFAULT_INDEX; | |
| 3015 data.last_charset = Qunbound; | |
| 3016 data.last_findex = DEFAULT_INDEX; | |
| 3017 data.result_str = Qnil; | |
| 3018 data.string = Qnil; | |
| 3019 | |
| 3020 Dynarr_reset (data.db->runes); | |
| 3021 | |
| 3022 if (STRINGP (Voverlay_arrow_string)) | |
| 3023 { | |
| 867 | 3024 add_ibyte_string_runes |
| 428 | 3025 (&data, |
| 3026 XSTRING_DATA (Voverlay_arrow_string), | |
| 3027 XSTRING_LENGTH (Voverlay_arrow_string), | |
| 793 | 3028 1, 0); |
| 428 | 3029 } |
| 3030 else if (GLYPHP (Voverlay_arrow_string)) | |
| 3031 { | |
| 3032 struct glyph_block gb; | |
| 3033 | |
| 3034 gb.glyph = Voverlay_arrow_string; | |
| 3035 gb.extent = Qnil; | |
| 3036 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0); | |
| 3037 } | |
| 4187 | 3038 |
| 428 | 3039 if (data.max_pixmap_height) |
| 3040 { | |
| 3041 int height = data.new_ascent + data.new_descent; | |
| 3042 int pix_ascent, pix_descent; | |
| 4187 | 3043 |
| 428 | 3044 pix_descent = data.max_pixmap_height * data.new_descent / height; |
| 3045 pix_ascent = data.max_pixmap_height - pix_descent; | |
| 819 | 3046 calculate_baseline (&data); |
| 428 | 3047 |
| 3048 data.new_ascent = max (data.new_ascent, pix_ascent); | |
| 3049 data.new_descent = max (data.new_descent, pix_descent); | |
| 3050 } | |
| 3051 | |
| 3052 dl->ascent = data.new_ascent; | |
| 3053 dl->descent = data.new_descent; | |
| 3054 | |
| 3055 data.db->start_pos = dl->bounds.left_in; | |
| 3056 data.db->end_pos = data.pixpos; | |
| 3057 | |
| 819 | 3058 calculate_yoffset (dl, data.db); |
| 3059 | |
| 428 | 3060 return data.pixpos - dl->bounds.left_in; |
| 3061 } | |
| 3062 | |
| 3063 /* Add a type of glyph to a margin display block. */ | |
| 3064 | |
| 3065 static int | |
| 3066 add_margin_runes (struct display_line *dl, struct display_block *db, int start, | |
| 3067 int count, enum glyph_layout layout, int side, Lisp_Object window) | |
| 3068 { | |
| 3069 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS | |
| 3070 ? dl->left_glyphs | |
| 3071 : dl->right_glyphs); | |
| 3072 int elt, end; | |
| 3073 int reverse; | |
| 442 | 3074 struct window *w = XWINDOW (window); |
| 3075 struct frame *f = XFRAME (w->frame); | |
| 3076 struct device *d = XDEVICE (f->device); | |
| 3077 pos_data data; | |
| 3078 | |
| 3079 xzero (data); | |
| 3080 data.d = d; | |
| 3081 data.window = window; | |
| 3082 data.db = db; | |
| 3083 data.dl = dl; | |
| 3084 data.pixpos = start; | |
| 3085 data.cursor_type = NO_CURSOR; | |
| 3086 data.cursor_x = -1; | |
| 3087 data.last_charset = Qunbound; | |
| 3088 data.last_findex = DEFAULT_INDEX; | |
| 3089 data.result_str = Qnil; | |
| 3090 data.string = Qnil; | |
| 3091 data.new_ascent = dl->ascent; | |
| 3092 data.new_descent = dl->descent; | |
| 428 | 3093 |
| 3094 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS) | |
| 3095 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS)) | |
| 3096 { | |
| 3097 reverse = 1; | |
| 3098 elt = Dynarr_length (gbd) - 1; | |
| 3099 end = 0; | |
| 3100 } | |
| 3101 else | |
| 3102 { | |
| 3103 reverse = 0; | |
| 3104 elt = 0; | |
| 3105 end = Dynarr_length (gbd); | |
| 3106 } | |
| 3107 | |
| 3108 while (count && ((!reverse && elt < end) || (reverse && elt >= end))) | |
| 3109 { | |
| 3110 struct glyph_block *gb = Dynarr_atp (gbd, elt); | |
| 3111 | |
| 3112 if (NILP (gb->extent)) | |
| 2500 | 3113 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3114 |
| 3115 if (gb->active && | |
| 3116 ((side == LEFT_GLYPHS && | |
| 3117 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout) | |
| 3118 || (side == RIGHT_GLYPHS && | |
| 3119 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout))) | |
| 3120 { | |
| 442 | 3121 data.findex = gb->findex; |
| 3122 data.max_pixpos = data.pixpos + gb->width; | |
| 3123 add_glyph_rune (&data, gb, side, 0, NULL); | |
| 428 | 3124 count--; |
| 3125 gb->active = 0; | |
| 3126 } | |
| 3127 | |
| 3128 (reverse ? elt-- : elt++); | |
| 3129 } | |
| 3130 | |
| 819 | 3131 calculate_baseline (&data); |
| 442 | 3132 |
| 3133 dl->ascent = data.new_ascent; | |
| 3134 dl->descent = data.new_descent; | |
| 3135 | |
| 819 | 3136 calculate_yoffset (dl, data.db); |
| 3137 | |
| 442 | 3138 return data.pixpos; |
| 428 | 3139 } |
| 3140 | |
| 3141 /* Add a blank to a margin display block. */ | |
| 3142 | |
| 3143 static void | |
| 2286 | 3144 add_margin_blank (struct display_line *UNUSED (dl), struct display_block *db, |
| 428 | 3145 struct window *w, int xpos, int width, int side) |
| 3146 { | |
| 3147 struct rune rb; | |
| 3148 | |
| 3149 rb.findex = (side == LEFT_GLYPHS | |
| 3150 ? get_builtin_face_cache_index (w, Vleft_margin_face) | |
| 3151 : get_builtin_face_cache_index (w, Vright_margin_face)); | |
| 3152 rb.xpos = xpos; | |
| 3153 rb.width = width; | |
| 826 | 3154 rb.charpos = -1; |
| 428 | 3155 rb.endpos = 0; |
| 3156 rb.type = RUNE_BLANK; | |
| 3157 rb.cursor_type = CURSOR_OFF; | |
| 3158 | |
| 3159 Dynarr_add (db->runes, rb); | |
| 3160 } | |
| 3161 | |
| 3162 /* Display glyphs in the left outside margin, left inside margin and | |
| 3163 left whitespace area. */ | |
| 3164 | |
| 3165 static void | |
| 3166 create_left_glyph_block (struct window *w, struct display_line *dl, | |
| 3167 int overlay_width) | |
| 3168 { | |
| 3169 Lisp_Object window; | |
| 3170 | |
| 3171 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1); | |
| 3172 int elt, end_xpos; | |
| 3173 int out_end, in_out_start, in_in_end, white_out_start, white_in_start; | |
| 3174 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt; | |
| 3175 int left_in_start = dl->bounds.left_in; | |
| 3176 int left_in_end = dl->bounds.left_in + overlay_width; | |
| 3177 | |
| 3178 struct display_block *odb, *idb; | |
| 3179 | |
| 793 | 3180 window = wrap_window (w); |
| 428 | 3181 |
| 3182 /* We have to add the glyphs to the line in the order outside, | |
| 3183 inside, whitespace. However the precedence dictates that we | |
| 3184 determine how many will fit in the reverse order. */ | |
| 3185 | |
| 3186 /* Determine how many whitespace glyphs we can display and where | |
| 3187 they should start. */ | |
| 3188 white_in_start = dl->bounds.left_white; | |
| 3189 white_out_start = left_in_start; | |
| 3190 white_out_cnt = white_in_cnt = 0; | |
| 3191 elt = 0; | |
| 3192 | |
| 3193 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3194 { | |
| 3195 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3196 | |
| 3197 if (NILP (gb->extent)) | |
| 2500 | 3198 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3199 |
| 3200 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE) | |
| 3201 { | |
| 3202 int width; | |
| 3203 | |
| 438 | 3204 width = glyph_width (gb->glyph, window); |
| 428 | 3205 |
| 3206 if (white_in_start - width >= left_in_end) | |
| 3207 { | |
| 3208 white_in_cnt++; | |
| 3209 white_in_start -= width; | |
| 3210 gb->width = width; | |
| 3211 gb->active = 1; | |
| 3212 } | |
| 3213 else if (use_overflow | |
| 3214 && (white_out_start - width > dl->bounds.left_out)) | |
| 3215 { | |
| 3216 white_out_cnt++; | |
| 3217 white_out_start -= width; | |
| 3218 gb->width = width; | |
| 3219 gb->active = 1; | |
| 3220 } | |
| 3221 else | |
| 3222 gb->active = 0; | |
| 3223 } | |
| 3224 | |
| 3225 elt++; | |
| 3226 } | |
| 3227 | |
| 3228 /* Determine how many inside margin glyphs we can display and where | |
| 3229 they should start. The inside margin glyphs get whatever space | |
| 3230 is left after the whitespace glyphs have been displayed. These | |
| 3231 are tricky to calculate since if we decide to use the overflow | |
| 3232 area we basically have to start over. So for these we build up a | |
| 3233 list of just the inside margin glyphs and manipulate it to | |
| 3234 determine the needed info. */ | |
| 3235 { | |
| 3236 glyph_block_dynarr *ib; | |
| 3237 int avail_in, avail_out; | |
| 3238 int done = 0; | |
| 3239 int marker = 0; | |
| 3240 int used_in, used_out; | |
| 3241 | |
| 3242 elt = 0; | |
| 3243 used_in = used_out = 0; | |
| 3244 ib = Dynarr_new (glyph_block); | |
| 3245 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3246 { | |
| 3247 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3248 | |
| 3249 if (NILP (gb->extent)) | |
| 2500 | 3250 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3251 |
| 3252 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == | |
| 3253 GL_INSIDE_MARGIN) | |
| 3254 { | |
| 438 | 3255 gb->width = glyph_width (gb->glyph, window); |
| 428 | 3256 used_in += gb->width; |
| 3257 Dynarr_add (ib, *gb); | |
| 3258 } | |
| 3259 | |
| 3260 elt++; | |
| 3261 } | |
| 3262 | |
| 3263 if (white_out_cnt) | |
| 3264 avail_in = 0; | |
| 3265 else | |
| 3266 { | |
| 3267 avail_in = white_in_start - left_in_end; | |
| 3268 if (avail_in < 0) | |
| 3269 avail_in = 0; | |
| 3270 } | |
| 3271 | |
| 3272 if (!use_overflow) | |
| 3273 avail_out = 0; | |
| 3274 else | |
| 3275 avail_out = white_out_start - dl->bounds.left_out; | |
| 3276 | |
| 3277 marker = 0; | |
| 3278 while (!done && marker < Dynarr_length (ib)) | |
| 3279 { | |
| 3280 int width = Dynarr_atp (ib, marker)->width; | |
| 3281 | |
| 3282 /* If everything now fits in the available inside margin | |
| 4187 | 3283 space, we're done. */ |
| 428 | 3284 if (used_in <= avail_in) |
| 3285 done = 1; | |
| 3286 else | |
| 3287 { | |
| 3288 /* Otherwise see if we have room to move a glyph to the | |
| 4187 | 3289 outside. */ |
| 428 | 3290 if (used_out + width <= avail_out) |
| 3291 { | |
| 3292 used_out += width; | |
| 3293 used_in -= width; | |
| 3294 } | |
| 3295 else | |
| 3296 done = 1; | |
| 3297 } | |
| 3298 | |
| 3299 if (!done) | |
| 3300 marker++; | |
| 3301 } | |
| 3302 | |
| 3303 /* At this point we now know that everything from marker on goes in | |
| 3304 the inside margin and everything before it goes in the outside | |
| 3305 margin. The stuff going into the outside margin is guaranteed | |
| 3306 to fit, but we may have to trim some stuff from the inside. */ | |
| 3307 | |
| 3308 in_in_end = left_in_end; | |
| 3309 in_out_start = white_out_start; | |
| 3310 in_out_cnt = in_in_cnt = 0; | |
| 3311 | |
| 3312 Dynarr_free (ib); | |
| 3313 elt = 0; | |
| 3314 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3315 { | |
| 3316 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3317 | |
| 3318 if (NILP (gb->extent)) | |
| 2500 | 3319 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3320 |
| 3321 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == | |
| 3322 GL_INSIDE_MARGIN) | |
| 3323 { | |
| 438 | 3324 int width = glyph_width (gb->glyph, window); |
| 428 | 3325 |
| 3326 if (used_out) | |
| 3327 { | |
| 3328 in_out_cnt++; | |
| 3329 in_out_start -= width; | |
| 3330 gb->width = width; | |
| 3331 gb->active = 1; | |
| 3332 used_out -= width; | |
| 3333 } | |
| 3334 else if (in_in_end + width < white_in_start) | |
| 3335 { | |
| 3336 in_in_cnt++; | |
| 3337 in_in_end += width; | |
| 3338 gb->width = width; | |
| 3339 gb->active = 1; | |
| 3340 } | |
| 3341 else | |
| 3342 gb->active = 0; | |
| 3343 } | |
| 3344 | |
| 3345 elt++; | |
| 3346 } | |
| 3347 } | |
| 3348 | |
| 3349 /* Determine how many outside margin glyphs we can display. They | |
| 3350 always start at the left outside margin and can only use the | |
| 3351 outside margin space. */ | |
| 3352 out_end = dl->bounds.left_out; | |
| 3353 out_cnt = 0; | |
| 3354 elt = 0; | |
| 3355 | |
| 3356 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3357 { | |
| 3358 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3359 | |
| 3360 if (NILP (gb->extent)) | |
| 2500 | 3361 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3362 |
| 3363 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == | |
| 3364 GL_OUTSIDE_MARGIN) | |
| 3365 { | |
| 438 | 3366 int width = glyph_width (gb->glyph, window); |
| 428 | 3367 |
| 3368 if (out_end + width <= in_out_start) | |
| 3369 { | |
| 3370 out_cnt++; | |
| 3371 out_end += width; | |
| 3372 gb->width = width; | |
| 3373 gb->active = 1; | |
| 3374 } | |
| 3375 else | |
| 3376 gb->active = 0; | |
| 3377 } | |
| 3378 | |
| 3379 elt++; | |
| 3380 } | |
| 3381 | |
| 3382 /* Now that we know where everything goes, we add the glyphs as | |
| 3383 runes to the appropriate display blocks. */ | |
| 3384 if (out_cnt || in_out_cnt || white_out_cnt) | |
| 3385 { | |
| 3386 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN); | |
| 3387 odb->start_pos = dl->bounds.left_out; | |
| 3388 /* #### We should stop adding a blank to account for the space | |
| 4187 | 3389 between the end of the glyphs and the margin and instead set |
| 3390 this accordingly. */ | |
| 428 | 3391 odb->end_pos = dl->bounds.left_in; |
| 3392 Dynarr_reset (odb->runes); | |
| 3393 } | |
| 3394 else | |
| 3395 odb = 0; | |
| 3396 | |
| 3397 if (in_in_cnt || white_in_cnt) | |
| 3398 { | |
| 3399 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN); | |
| 3400 idb->start_pos = dl->bounds.left_in; | |
| 3401 /* #### See above comment for odb->end_pos */ | |
| 3402 idb->end_pos = dl->bounds.left_white; | |
| 3403 Dynarr_reset (idb->runes); | |
| 3404 } | |
| 3405 else | |
| 3406 idb = 0; | |
| 3407 | |
| 3408 /* First add the outside margin glyphs. */ | |
| 3409 if (out_cnt) | |
| 3410 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt, | |
| 3411 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window); | |
| 3412 else | |
| 3413 end_xpos = dl->bounds.left_out; | |
| 3414 | |
| 3415 /* There may be blank space between the outside margin glyphs and | |
| 3416 the inside margin glyphs. If so, add a blank. */ | |
| 3417 if (in_out_cnt && (in_out_start - end_xpos)) | |
| 3418 { | |
| 3419 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos, | |
| 3420 LEFT_GLYPHS); | |
| 3421 } | |
| 3422 | |
| 3423 /* Next add the inside margin glyphs which are actually in the | |
| 3424 outside margin. */ | |
| 3425 if (in_out_cnt) | |
| 3426 { | |
| 3427 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt, | |
| 3428 GL_INSIDE_MARGIN, LEFT_GLYPHS, window); | |
| 3429 } | |
| 3430 | |
| 3431 /* If we didn't add any inside margin glyphs to the outside margin, | |
| 3432 but are adding whitespace glyphs, then we need to add a blank | |
| 3433 here. */ | |
| 3434 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos)) | |
| 3435 { | |
| 3436 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos, | |
| 3437 LEFT_GLYPHS); | |
| 3438 } | |
| 3439 | |
| 3440 /* Next add the whitespace margin glyphs which are actually in the | |
| 3441 outside margin. */ | |
| 3442 if (white_out_cnt) | |
| 3443 { | |
| 3444 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt, | |
| 3445 GL_WHITESPACE, LEFT_GLYPHS, window); | |
| 3446 } | |
| 3447 | |
| 3448 /* We take care of clearing between the end of the glyphs and the | |
| 3449 start of the inside margin for lines which have glyphs. */ | |
| 3450 if (odb && (left_in_start - end_xpos)) | |
| 3451 { | |
| 3452 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos, | |
| 3453 LEFT_GLYPHS); | |
| 3454 } | |
| 3455 | |
| 3456 /* Next add the inside margin glyphs which are actually in the | |
| 3457 inside margin. */ | |
| 3458 if (in_in_cnt) | |
| 3459 { | |
| 3460 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt, | |
| 3461 GL_INSIDE_MARGIN, LEFT_GLYPHS, window); | |
| 3462 } | |
| 3463 else | |
| 3464 end_xpos = left_in_end; | |
| 3465 | |
| 3466 /* Make sure that the area between the end of the inside margin | |
| 3467 glyphs and the whitespace glyphs is cleared. */ | |
| 3468 if (idb && (white_in_start - end_xpos > 0)) | |
| 3469 { | |
| 3470 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos, | |
| 3471 LEFT_GLYPHS); | |
| 3472 } | |
| 3473 | |
| 3474 /* Next add the whitespace margin glyphs which are actually in the | |
| 3475 inside margin. */ | |
| 3476 if (white_in_cnt) | |
| 3477 { | |
| 3478 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE, | |
| 3479 LEFT_GLYPHS, window); | |
| 3480 } | |
| 3481 | |
| 3482 /* Whitespace glyphs always end right next to the text block so | |
| 3483 there is nothing we have to make sure is cleared after them. */ | |
| 3484 } | |
| 3485 | |
| 3486 /* Display glyphs in the right outside margin, right inside margin and | |
| 3487 right whitespace area. */ | |
| 3488 | |
| 3489 static void | |
| 3490 create_right_glyph_block (struct window *w, struct display_line *dl) | |
| 3491 { | |
| 3492 Lisp_Object window; | |
| 3493 | |
| 3494 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1); | |
| 3495 int elt, end_xpos; | |
| 3496 int out_start, in_out_end, in_in_start, white_out_end, white_in_end; | |
| 3497 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt; | |
| 3498 | |
| 3499 struct display_block *odb, *idb; | |
| 3500 | |
| 793 | 3501 window = wrap_window (w); |
| 428 | 3502 |
| 3503 /* We have to add the glyphs to the line in the order outside, | |
| 3504 inside, whitespace. However the precedence dictates that we | |
| 3505 determine how many will fit in the reverse order. */ | |
| 3506 | |
| 3507 /* Determine how many whitespace glyphs we can display and where | |
| 3508 they should start. */ | |
| 3509 white_in_end = dl->bounds.right_white; | |
| 3510 white_out_end = dl->bounds.right_in; | |
| 3511 white_out_cnt = white_in_cnt = 0; | |
| 3512 elt = 0; | |
| 3513 | |
| 3514 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3515 { | |
| 3516 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3517 | |
| 3518 if (NILP (gb->extent)) | |
| 2500 | 3519 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3520 |
| 3521 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE) | |
| 3522 { | |
| 438 | 3523 int width = glyph_width (gb->glyph, window); |
| 428 | 3524 |
| 3525 if (white_in_end + width <= dl->bounds.right_in) | |
| 3526 { | |
| 3527 white_in_cnt++; | |
| 3528 white_in_end += width; | |
| 3529 gb->width = width; | |
| 3530 gb->active = 1; | |
| 3531 } | |
| 3532 else if (use_overflow | |
| 3533 && (white_out_end + width <= dl->bounds.right_out)) | |
| 3534 { | |
| 3535 white_out_cnt++; | |
| 3536 white_out_end += width; | |
| 3537 gb->width = width; | |
| 3538 gb->active = 1; | |
| 3539 } | |
| 3540 else | |
| 3541 gb->active = 0; | |
| 3542 } | |
| 3543 | |
| 3544 elt++; | |
| 3545 } | |
| 3546 | |
| 3547 /* Determine how many inside margin glyphs we can display and where | |
| 3548 they should start. The inside margin glyphs get whatever space | |
| 3549 is left after the whitespace glyphs have been displayed. These | |
| 3550 are tricky to calculate since if we decide to use the overflow | |
| 3551 area we basically have to start over. So for these we build up a | |
| 3552 list of just the inside margin glyphs and manipulate it to | |
| 3553 determine the needed info. */ | |
| 3554 { | |
| 3555 glyph_block_dynarr *ib; | |
| 3556 int avail_in, avail_out; | |
| 3557 int done = 0; | |
| 3558 int marker = 0; | |
| 3559 int used_in, used_out; | |
| 3560 | |
| 3561 elt = 0; | |
| 3562 used_in = used_out = 0; | |
| 3563 ib = Dynarr_new (glyph_block); | |
| 3564 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3565 { | |
| 3566 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3567 | |
| 3568 if (NILP (gb->extent)) | |
| 2500 | 3569 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3570 |
| 3571 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN) | |
| 3572 { | |
| 438 | 3573 gb->width = glyph_width (gb->glyph, window); |
| 428 | 3574 used_in += gb->width; |
| 3575 Dynarr_add (ib, *gb); | |
| 3576 } | |
| 3577 | |
| 3578 elt++; | |
| 3579 } | |
| 3580 | |
| 3581 if (white_out_cnt) | |
| 3582 avail_in = 0; | |
| 3583 else | |
| 3584 avail_in = dl->bounds.right_in - white_in_end; | |
| 3585 | |
| 3586 if (!use_overflow) | |
| 3587 avail_out = 0; | |
| 3588 else | |
| 3589 avail_out = dl->bounds.right_out - white_out_end; | |
| 3590 | |
| 3591 marker = 0; | |
| 3592 while (!done && marker < Dynarr_length (ib)) | |
| 3593 { | |
| 3594 int width = Dynarr_atp (ib, marker)->width; | |
| 3595 | |
| 3596 /* If everything now fits in the available inside margin | |
| 4187 | 3597 space, we're done. */ |
| 428 | 3598 if (used_in <= avail_in) |
| 3599 done = 1; | |
| 3600 else | |
| 3601 { | |
| 3602 /* Otherwise see if we have room to move a glyph to the | |
| 4187 | 3603 outside. */ |
| 428 | 3604 if (used_out + width <= avail_out) |
| 3605 { | |
| 3606 used_out += width; | |
| 3607 used_in -= width; | |
| 3608 } | |
| 3609 else | |
| 3610 done = 1; | |
| 3611 } | |
| 3612 | |
| 3613 if (!done) | |
| 3614 marker++; | |
| 3615 } | |
| 3616 | |
| 3617 /* At this point we now know that everything from marker on goes in | |
| 3618 the inside margin and everything before it goes in the outside | |
| 3619 margin. The stuff going into the outside margin is guaranteed | |
| 3620 to fit, but we may have to trim some stuff from the inside. */ | |
| 3621 | |
| 3622 in_in_start = dl->bounds.right_in; | |
| 3623 in_out_end = dl->bounds.right_in; | |
| 3624 in_out_cnt = in_in_cnt = 0; | |
| 3625 | |
| 3626 Dynarr_free (ib); | |
| 3627 elt = 0; | |
| 3628 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3629 { | |
| 3630 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3631 | |
| 3632 if (NILP (gb->extent)) | |
| 2500 | 3633 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3634 |
| 3635 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN) | |
| 3636 { | |
| 438 | 3637 int width = glyph_width (gb->glyph, window); |
| 428 | 3638 |
| 3639 if (used_out) | |
| 3640 { | |
| 3641 in_out_cnt++; | |
| 3642 in_out_end += width; | |
| 3643 gb->width = width; | |
| 3644 gb->active = 1; | |
| 3645 used_out -= width; | |
| 3646 } | |
| 3647 else if (in_in_start - width >= white_in_end) | |
| 3648 { | |
| 3649 in_in_cnt++; | |
| 3650 in_in_start -= width; | |
| 3651 gb->width = width; | |
| 3652 gb->active = 1; | |
| 3653 } | |
| 3654 else | |
| 3655 gb->active = 0; | |
| 3656 } | |
| 3657 | |
| 3658 elt++; | |
| 3659 } | |
| 3660 } | |
| 3661 | |
| 3662 /* Determine how many outside margin glyphs we can display. They | |
| 3663 always start at the right outside margin and can only use the | |
| 3664 outside margin space. */ | |
| 3665 out_start = dl->bounds.right_out; | |
| 3666 out_cnt = 0; | |
| 3667 elt = 0; | |
| 3668 | |
| 3669 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3670 { | |
| 3671 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3672 | |
| 3673 if (NILP (gb->extent)) | |
| 2500 | 3674 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3675 |
| 3676 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN) | |
| 3677 { | |
| 438 | 3678 int width = glyph_width (gb->glyph, window); |
| 428 | 3679 |
| 3680 if (out_start - width >= in_out_end) | |
| 3681 { | |
| 3682 out_cnt++; | |
| 3683 out_start -= width; | |
| 3684 gb->width = width; | |
| 3685 gb->active = 1; | |
| 3686 } | |
| 3687 else | |
| 3688 gb->active = 0; | |
| 3689 } | |
| 3690 | |
| 3691 elt++; | |
| 3692 } | |
| 3693 | |
| 3694 /* Now that we now where everything goes, we add the glyphs as runes | |
| 3695 to the appropriate display blocks. */ | |
| 3696 if (out_cnt || in_out_cnt || white_out_cnt) | |
| 3697 { | |
| 3698 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN); | |
| 3699 /* #### See comments before odb->start_pos init in | |
| 4187 | 3700 create_left_glyph_block */ |
| 428 | 3701 odb->start_pos = dl->bounds.right_in; |
| 3702 odb->end_pos = dl->bounds.right_out; | |
| 3703 Dynarr_reset (odb->runes); | |
| 3704 } | |
| 3705 else | |
| 3706 odb = 0; | |
| 3707 | |
| 3708 if (in_in_cnt || white_in_cnt) | |
| 3709 { | |
| 3710 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN); | |
| 3711 idb->start_pos = dl->bounds.right_white; | |
| 3712 /* #### See comments before odb->start_pos init in | |
| 4187 | 3713 create_left_glyph_block */ |
| 428 | 3714 idb->end_pos = dl->bounds.right_in; |
| 3715 Dynarr_reset (idb->runes); | |
| 3716 } | |
| 3717 else | |
| 3718 idb = 0; | |
| 3719 | |
| 3720 /* First add the whitespace margin glyphs which are actually in the | |
| 3721 inside margin. */ | |
| 3722 if (white_in_cnt) | |
| 3723 { | |
| 3724 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white, | |
| 3725 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS, | |
| 3726 window); | |
| 3727 } | |
| 3728 else | |
| 3729 end_xpos = dl->bounds.right_white; | |
| 3730 | |
| 3731 /* Make sure that the area between the end of the whitespace glyphs | |
| 3732 and the inside margin glyphs is cleared. */ | |
| 3733 if (in_in_cnt && (in_in_start - end_xpos)) | |
| 3734 { | |
| 3735 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos, | |
| 3736 RIGHT_GLYPHS); | |
| 3737 } | |
| 3738 | |
| 3739 /* Next add the inside margin glyphs which are actually in the | |
| 3740 inside margin. */ | |
| 3741 if (in_in_cnt) | |
| 3742 { | |
| 3743 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt, | |
| 3744 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window); | |
| 3745 } | |
| 3746 | |
| 3747 /* If we didn't add any inside margin glyphs then make sure the rest | |
| 3748 of the inside margin area gets cleared. */ | |
| 3749 if (idb && (dl->bounds.right_in - end_xpos)) | |
| 3750 { | |
| 3751 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos, | |
| 3752 RIGHT_GLYPHS); | |
| 3753 } | |
| 3754 | |
| 3755 /* Next add any whitespace glyphs in the outside margin. */ | |
| 3756 if (white_out_cnt) | |
| 3757 { | |
| 3758 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt, | |
| 3759 GL_WHITESPACE, RIGHT_GLYPHS, window); | |
| 3760 } | |
| 3761 else | |
| 3762 end_xpos = dl->bounds.right_in; | |
| 3763 | |
| 3764 /* Next add any inside margin glyphs in the outside margin. */ | |
| 3765 if (in_out_cnt) | |
| 3766 { | |
| 3767 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt, | |
| 3768 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window); | |
| 3769 } | |
| 3770 | |
| 3771 /* There may be space between any whitespace or inside margin glyphs | |
| 3772 in the outside margin and the actual outside margin glyphs. */ | |
| 3773 if (odb && (out_start - end_xpos)) | |
| 3774 { | |
| 3775 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos, | |
| 3776 RIGHT_GLYPHS); | |
| 3777 } | |
| 3778 | |
| 3779 /* Finally, add the outside margin glyphs. */ | |
| 3780 if (out_cnt) | |
| 3781 { | |
| 3782 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN, | |
| 3783 RIGHT_GLYPHS, window); | |
| 3784 } | |
| 3785 } | |
| 3786 | |
| 3787 | |
| 3788 /***************************************************************************/ | |
| 3789 /* */ | |
| 3790 /* modeline routines */ | |
| 3791 /* */ | |
| 3792 /***************************************************************************/ | |
| 3793 | |
| 438 | 3794 /* This function is also used in frame.c by `generate_title_string' */ |
| 3795 void | |
| 3796 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str, | |
| 4187 | 3797 struct window *w, struct display_line *dl, |
| 3798 struct display_block *db, face_index findex, | |
| 3799 int min_pixpos, int max_pixpos, int type) | |
| 438 | 3800 { |
| 3801 struct frame *f = XFRAME (w->frame); | |
| 3802 struct device *d = XDEVICE (f->device); | |
| 3803 | |
| 3804 pos_data data; | |
| 3805 int c_pixpos; | |
| 3806 Charcount offset = 0; | |
| 3807 | |
| 3808 xzero (data); | |
| 3809 data.d = d; | |
| 3810 data.db = db; | |
| 3811 data.dl = dl; | |
| 3812 data.findex = findex; | |
| 3813 data.pixpos = min_pixpos; | |
| 3814 data.max_pixpos = max_pixpos; | |
| 3815 data.cursor_type = NO_CURSOR; | |
| 3816 data.last_charset = Qunbound; | |
| 3817 data.last_findex = DEFAULT_INDEX; | |
| 3818 data.result_str = result_str; | |
| 3819 data.is_modeline = 1; | |
| 3820 data.string = Qnil; | |
| 793 | 3821 data.window = wrap_window (w); |
| 438 | 3822 |
| 3823 Dynarr_reset (formatted_string_extent_dynarr); | |
| 3824 Dynarr_reset (formatted_string_extent_start_dynarr); | |
| 3825 Dynarr_reset (formatted_string_extent_end_dynarr); | |
| 3826 | |
| 3827 /* result_str is nil when we're building a frame or icon title. Otherwise, | |
| 3828 we're building a modeline, so the offset starts at the modeline | |
| 442 | 3829 horizontal scrolling amount */ |
| 438 | 3830 if (! NILP (result_str)) |
| 3831 offset = w->modeline_hscroll; | |
| 3832 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0, | |
| 4187 | 3833 max_pixpos - min_pixpos, findex, type, &offset, |
| 438 | 3834 Qnil); |
| 3835 | |
| 3836 if (Dynarr_length (db->runes)) | |
| 3837 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3838 struct rune *rb = Dynarr_lastp (db->runes); |
| 438 | 3839 c_pixpos = rb->xpos + rb->width; |
| 3840 } | |
| 3841 else | |
| 3842 c_pixpos = min_pixpos; | |
| 3843 | |
| 3844 /* If we don't reach the right side of the window, add a blank rune | |
| 3845 to make up the difference. This usually only occurs if the | |
| 3846 modeline face is using a proportional width font or a fixed width | |
| 3847 font of a different size from the default face font. */ | |
| 3848 | |
| 3849 if (c_pixpos < max_pixpos) | |
| 3850 { | |
| 3851 data.pixpos = c_pixpos; | |
| 3852 data.blank_width = max_pixpos - data.pixpos; | |
| 3853 | |
| 3854 add_blank_rune (&data, NULL, 0); | |
| 3855 } | |
| 3856 | |
| 3857 /* Now create the result string and frob the extents into it. */ | |
| 3858 if (!NILP (result_str)) | |
| 3859 { | |
| 3860 int elt; | |
| 3861 Bytecount len; | |
| 867 | 3862 Ibyte *strdata; |
| 438 | 3863 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w)); |
| 3864 | |
| 442 | 3865 in_modeline_generation = 1; |
| 3866 | |
| 771 | 3867 sledgehammer_check_ascii_begin (result_str); |
| 438 | 3868 detach_all_extents (result_str); |
| 793 | 3869 resize_string (result_str, -1, |
| 4187 | 3870 data.bytepos - XSTRING_LENGTH (result_str)); |
| 438 | 3871 |
| 3872 strdata = XSTRING_DATA (result_str); | |
| 3873 | |
| 3874 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++) | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3875 { |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3876 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR) |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3877 { |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3878 len += (set_itext_ichar |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3879 (strdata + len, Dynarr_atp (db->runes, |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3880 elt)->object.chr.ch)); |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3881 } |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3882 } |
| 438 | 3883 |
| 771 | 3884 init_string_ascii_begin (result_str); |
| 3885 bump_string_modiff (result_str); | |
| 3886 sledgehammer_check_ascii_begin (result_str); | |
| 3887 | |
| 438 | 3888 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr); |
| 4187 | 3889 elt++) |
| 3890 { | |
| 3891 Lisp_Object extent = Qnil; | |
| 3892 Lisp_Object child; | |
| 3893 | |
| 3894 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt)); | |
| 3895 child = Fgethash (extent, buf->modeline_extent_table, Qnil); | |
| 3896 if (NILP (child)) | |
| 3897 { | |
| 3898 child = Fmake_extent (Qnil, Qnil, result_str); | |
| 3899 Fputhash (extent, child, buf->modeline_extent_table); | |
| 3900 } | |
| 3901 Fset_extent_parent (child, extent); | |
| 3902 set_extent_endpoints | |
| 3903 (XEXTENT (child), | |
| 3904 Dynarr_at (formatted_string_extent_start_dynarr, elt), | |
| 3905 Dynarr_at (formatted_string_extent_end_dynarr, elt), | |
| 3906 result_str); | |
| 3907 } | |
| 442 | 3908 |
| 3909 in_modeline_generation = 0; | |
| 438 | 3910 } |
| 3911 } | |
| 3912 | |
| 428 | 3913 /* Ensure that the given display line DL accurately represents the |
| 3914 modeline for the given window. */ | |
| 3915 static void | |
| 3916 generate_modeline (struct window *w, struct display_line *dl, int type) | |
| 3917 { | |
| 3918 struct buffer *b = XBUFFER (w->buffer); | |
| 3919 struct frame *f = XFRAME (w->frame); | |
| 3920 struct device *d = XDEVICE (f->device); | |
| 3921 | |
| 3922 /* Unlike display line and rune pointers, this one can't change underneath | |
| 3923 our feet. */ | |
| 3924 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 3925 int max_pixpos, min_pixpos, ypos_adj; | |
| 3926 Lisp_Object font_inst; | |
| 3927 | |
| 3928 /* This will actually determine incorrect inside boundaries for the | |
| 3929 modeline since it ignores the margins. However being aware of this fact | |
| 3930 we never use those values anywhere so it doesn't matter. */ | |
| 3931 dl->bounds = calculate_display_line_boundaries (w, 1); | |
| 3932 | |
| 3933 /* We are generating a modeline. */ | |
| 3934 dl->modeline = 1; | |
| 3935 dl->cursor_elt = -1; | |
| 3936 | |
| 3937 /* Reset the runes on the modeline. */ | |
| 3938 Dynarr_reset (db->runes); | |
| 3939 | |
| 3940 if (!WINDOW_HAS_MODELINE_P (w)) | |
| 3941 { | |
| 3942 struct rune rb; | |
| 3943 | |
| 3944 /* If there is a horizontal scrollbar, don't add anything. */ | |
| 3945 if (window_scrollbar_height (w)) | |
| 3946 return; | |
| 3947 | |
| 3948 dl->ascent = DEVMETH (d, divider_height, ()); | |
| 3949 dl->descent = 0; | |
| 3950 /* The modeline is at the bottom of the gutters. */ | |
| 3951 dl->ypos = WINDOW_BOTTOM (w); | |
| 3952 | |
| 3953 rb.findex = MODELINE_INDEX; | |
| 3954 rb.xpos = dl->bounds.left_out; | |
| 3955 rb.width = dl->bounds.right_out - dl->bounds.left_out; | |
| 826 | 3956 rb.charpos = 0; |
| 428 | 3957 rb.endpos = 0; |
| 3958 rb.type = RUNE_HLINE; | |
| 3959 rb.object.hline.thickness = 1; | |
| 3960 rb.object.hline.yoffset = 0; | |
| 3961 rb.cursor_type = NO_CURSOR; | |
| 3962 | |
| 3963 if (!EQ (Qzero, w->modeline_shadow_thickness) | |
| 3964 && FRAME_WIN_P (f)) | |
| 3965 { | |
| 3966 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w); | |
| 3967 | |
| 3968 dl->ypos -= shadow_thickness; | |
| 3969 rb.xpos += shadow_thickness; | |
| 3970 rb.width -= 2 * shadow_thickness; | |
| 3971 } | |
| 3972 | |
| 3973 Dynarr_add (db->runes, rb); | |
| 3974 return; | |
| 3975 } | |
| 3976 | |
| 3977 /* !!#### not right; needs to compute the max height of | |
| 3978 all the charsets */ | |
| 3979 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii); | |
| 3980 | |
| 3981 dl->ascent = XFONT_INSTANCE (font_inst)->ascent; | |
| 3982 dl->descent = XFONT_INSTANCE (font_inst)->descent; | |
| 3983 | |
| 3984 min_pixpos = dl->bounds.left_out; | |
| 3985 max_pixpos = dl->bounds.right_out; | |
| 3986 | |
| 3987 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f)) | |
| 3988 { | |
| 3989 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w); | |
| 3990 | |
| 3991 ypos_adj = shadow_thickness; | |
| 3992 min_pixpos += shadow_thickness; | |
| 3993 max_pixpos -= shadow_thickness; | |
| 3994 } | |
| 3995 else | |
| 3996 ypos_adj = 0; | |
| 3997 | |
| 3998 generate_formatted_string_db (b->modeline_format, | |
| 3999 b->generated_modeline_string, w, dl, db, | |
| 4000 MODELINE_INDEX, min_pixpos, max_pixpos, type); | |
| 4001 | |
| 4002 /* The modeline is at the bottom of the gutters. We have to wait to | |
| 4003 set this until we've generated the modeline in order to account | |
| 4004 for any embedded faces. */ | |
| 4005 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj; | |
| 4006 } | |
| 4007 | |
| 4008 static Charcount | |
| 867 | 4009 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str, |
| 4187 | 4010 Charcount pos, Charcount min_pos, |
| 771 | 4011 Charcount max_pos) |
| 428 | 4012 { |
| 4013 /* This function has been Mule-ized. */ | |
| 4014 Charcount end; | |
| 867 | 4015 const Ibyte *cur_pos = str; |
| 428 | 4016 struct display_block *db = data->db; |
| 4017 | |
| 4018 data->blank_width = space_width (XWINDOW (data->window)); | |
| 4019 while (Dynarr_length (db->runes) < pos) | |
| 4020 add_blank_rune (data, NULL, 0); | |
| 4021 | |
| 4022 end = (Dynarr_length (db->runes) + | |
| 4970 | 4023 bytecount_to_charcount (str, qxestrlen (str))); |
| 428 | 4024 if (max_pos != -1) |
| 4025 end = min (max_pos, end); | |
| 4026 | |
| 4027 while (pos < end && *cur_pos) | |
| 4028 { | |
| 867 | 4029 const Ibyte *old_cur_pos = cur_pos; |
| 428 | 4030 int succeeded; |
| 4031 | |
| 867 | 4032 data->ch = itext_ichar (cur_pos); |
| 4033 succeeded = (add_ichar_rune (data) != ADD_FAILED); | |
| 4034 INC_IBYTEPTR (cur_pos); | |
| 428 | 4035 if (succeeded) |
| 4187 | 4036 { |
| 4037 pos++; | |
| 4038 data->modeline_charpos++; | |
| 4039 data->bytepos += cur_pos - old_cur_pos; | |
| 4040 } | |
| 428 | 4041 } |
| 4042 | |
| 4043 while (Dynarr_length (db->runes) < min_pos && | |
| 4187 | 4044 (data->pixpos + data->blank_width <= data->max_pixpos)) |
| 428 | 4045 add_blank_rune (data, NULL, 0); |
| 4046 | |
| 4047 return Dynarr_length (db->runes); | |
| 4048 } | |
| 4049 | |
| 4050 /* #### Urk! Should also handle begin-glyphs and end-glyphs in | |
| 4051 modeline extents. */ | |
| 4052 static Charcount | |
| 4053 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph, | |
| 4187 | 4054 Charcount pos, Charcount UNUSED (min_pos), |
| 438 | 4055 Charcount max_pos, Lisp_Object extent) |
| 428 | 4056 { |
| 4057 /* This function has been Mule-ized. */ | |
| 4058 Charcount end; | |
| 4059 struct display_block *db = data->db; | |
| 4060 struct glyph_block gb; | |
| 4061 | |
| 4062 data->blank_width = space_width (XWINDOW (data->window)); | |
| 4063 while (Dynarr_length (db->runes) < pos) | |
| 4064 add_blank_rune (data, NULL, 0); | |
| 4065 | |
| 4066 end = Dynarr_length (db->runes) + 1; | |
| 4067 if (max_pos != -1) | |
| 4068 end = min (max_pos, end); | |
| 4069 | |
| 4070 gb.glyph = glyph; | |
| 438 | 4071 gb.extent = extent; |
| 428 | 4072 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0); |
| 4073 pos++; | |
| 4074 | |
| 4075 while (Dynarr_length (db->runes) < pos && | |
| 4187 | 4076 (data->pixpos + data->blank_width <= data->max_pixpos)) |
| 428 | 4077 add_blank_rune (data, NULL, 0); |
| 4078 | |
| 4079 return Dynarr_length (db->runes); | |
| 4080 } | |
| 4081 | |
| 4082 /* If max_pos is == -1, it is considered to be infinite. The same is | |
| 4083 true of max_pixsize. */ | |
| 4084 #define SET_CURRENT_MODE_CHARS_PIXSIZE \ | |
| 4085 if (Dynarr_length (data->db->runes)) \ | |
| 4967 | 4086 cur_pixsize = data->pixpos - Dynarr_begin (data->db->runes)->xpos; \ |
| 428 | 4087 else \ |
| 4088 cur_pixsize = 0; | |
| 4089 | |
| 4090 /* Note that this function does "positions" in terms of characters and | |
| 4091 not in terms of columns. This is necessary to make the formatting | |
| 4092 work correctly when proportional width fonts are used in the | |
| 4093 modeline. */ | |
| 4094 static Charcount | |
| 4095 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos, | |
| 4187 | 4096 Charcount min_pos, Charcount max_pos, |
| 4097 Lisp_Object elt, int depth, int max_pixsize, | |
| 4098 face_index findex, int type, Charcount *offset, | |
| 438 | 4099 Lisp_Object cur_ext) |
| 428 | 4100 { |
| 4101 /* This function has been Mule-ized. */ | |
| 4102 /* #### The other losing things in this function are: | |
| 4103 | |
| 4104 -- C zero-terminated-string lossage. | |
| 4105 -- Non-printable characters should be converted into something | |
| 4187 | 4106 appropriate (e.g. ^F) instead of blindly being printed anyway. |
| 428 | 4107 */ |
| 4108 | |
| 4109 tail_recurse: | |
| 4110 if (depth > 10) | |
| 4111 goto invalid; | |
| 4112 | |
| 4113 depth++; | |
| 4114 | |
| 4115 if (STRINGP (elt)) | |
| 4116 { | |
| 4117 /* A string. Add to the display line and check for %-constructs | |
| 4187 | 4118 within it. */ |
| 428 | 4119 |
| 2552 | 4120 Ibyte *this_str = XSTRING_DATA (elt); |
| 4121 | |
| 4122 while ((pos < max_pos || max_pos == -1) && *this_str) | |
| 4187 | 4123 { |
| 4124 Ibyte *last = this_str; | |
| 4125 | |
| 4126 while (*this_str && *this_str != '%') | |
| 4127 this_str++; | |
| 4128 | |
| 4129 if (this_str != last) | |
| 4130 { | |
| 4131 /* No %-construct */ | |
| 4132 Charcount size = | |
| 2552 | 4133 bytecount_to_charcount (last, this_str - last); |
| 438 | 4134 |
| 4135 if (size <= *offset) | |
| 4136 *offset -= size; | |
| 4137 else | |
| 4138 { | |
| 4139 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset : | |
| 4140 min (pos + size - *offset, max_pos)); | |
| 867 | 4141 const Ibyte *tmp_last = itext_n_addr (last, *offset); |
| 438 | 4142 |
| 4143 pos = add_string_to_fstring_db_runes (data, tmp_last, | |
| 4144 pos, pos, tmp_max); | |
| 4145 *offset = 0; | |
| 4146 } | |
| 4187 | 4147 } |
| 4148 else /* *this_str == '%' */ | |
| 4149 { | |
| 4150 Charcount spec_width = 0; | |
| 4151 | |
| 4152 this_str++; /* skip over '%' */ | |
| 4153 | |
| 4154 /* We can't allow -ve args due to the "%-" construct. | |
| 4155 * Argument specifies minwidth but not maxwidth | |
| 4156 * (maxwidth can be specified by | |
| 4157 * (<negative-number> . <stuff>) modeline elements) | |
| 4158 */ | |
| 4159 while (isdigit (*this_str)) | |
| 4160 { | |
| 4161 spec_width = spec_width * 10 + (*this_str - '0'); | |
| 4162 this_str++; | |
| 4163 } | |
| 4164 spec_width += pos; | |
| 4165 | |
| 4166 if (*this_str == 'M') | |
| 4167 { | |
| 4168 pos = generate_fstring_runes (w, data, pos, spec_width, | |
| 4169 max_pos, Vglobal_mode_string, | |
| 4170 depth, max_pixsize, findex, | |
| 4171 type, offset, cur_ext); | |
| 4172 } | |
| 4173 else if (*this_str == '-') | |
| 4174 { | |
| 4175 Charcount num_to_add; | |
| 4176 | |
| 4177 if (max_pixsize < 0) | |
| 4178 num_to_add = 0; | |
| 4179 else if (max_pos != -1) | |
| 4180 num_to_add = max_pos - pos; | |
| 4181 else | |
| 4182 { | |
| 4183 int cur_pixsize; | |
| 4184 int dash_pixsize; | |
| 4185 Ibyte ch = '-'; | |
| 4186 SET_CURRENT_MODE_CHARS_PIXSIZE; | |
| 4187 | |
| 4188 dash_pixsize = | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
4189 redisplay_window_text_width_string |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
4190 (w, findex, &ch, Qnil, 0, 1); |
| 4187 | 4191 |
| 4192 if (dash_pixsize == 0) | |
| 3094 | 4193 num_to_add = 0; |
| 4194 else { | |
| 4195 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize; | |
| 4196 num_to_add++; | |
| 4197 } | |
| 4187 | 4198 } |
| 4199 | |
| 4200 while (num_to_add--) | |
| 4201 pos = add_string_to_fstring_db_runes | |
| 4202 (data, (const Ibyte *) "-", pos, pos, max_pos); | |
| 4203 } | |
| 4204 else if (*this_str != 0) | |
| 4205 { | |
| 4206 Ichar ch = itext_ichar (this_str); | |
| 4207 Ibyte *str; | |
| 438 | 4208 Charcount size; |
| 4209 | |
| 4187 | 4210 decode_mode_spec (w, ch, type); |
| 4211 | |
| 4967 | 4212 str = Dynarr_begin (mode_spec_ibyte_string); |
| 438 | 4213 size = bytecount_to_charcount |
| 4214 /* Skip the null character added by `decode_mode_spec' */ | |
| 867 | 4215 (str, Dynarr_length (mode_spec_ibyte_string)) - 1; |
| 438 | 4216 |
| 4217 if (size <= *offset) | |
| 4218 *offset -= size; | |
| 4219 else | |
| 4220 { | |
| 867 | 4221 const Ibyte *tmp_str = itext_n_addr (str, *offset); |
| 438 | 4222 |
| 440 | 4223 /* #### NOTE: I don't understand why a tmp_max is not |
| 438 | 4224 computed and used here as in the plain string case |
| 4225 above. -- dv */ | |
| 4226 pos = add_string_to_fstring_db_runes (data, tmp_str, | |
| 4227 pos, pos, | |
| 4228 max_pos); | |
| 4229 *offset = 0; | |
| 4230 } | |
| 4187 | 4231 } |
| 4232 | |
| 4233 /* NOT this_str++. There could be any sort of character at | |
| 4234 the current position. */ | |
| 4235 INC_IBYTEPTR (this_str); | |
| 4236 } | |
| 4237 | |
| 4238 if (max_pixsize > 0) | |
| 4239 { | |
| 4240 int cur_pixsize; | |
| 4241 SET_CURRENT_MODE_CHARS_PIXSIZE; | |
| 4242 | |
| 4243 if (cur_pixsize >= max_pixsize) | |
| 4244 break; | |
| 4245 } | |
| 4246 } | |
| 428 | 4247 } |
| 4248 else if (SYMBOLP (elt)) | |
| 4249 { | |
| 4250 /* A symbol: process the value of the symbol recursively | |
| 4187 | 4251 as if it appeared here directly. */ |
| 428 | 4252 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer); |
| 4253 | |
| 4254 if (!UNBOUNDP (tem)) | |
| 4187 | 4255 { |
| 438 | 4256 /* If value is a string, output that string literally: |
| 4187 | 4257 don't check for % within it. */ |
| 4258 if (STRINGP (tem)) | |
| 4259 { | |
| 867 | 4260 Ibyte *str = XSTRING_DATA (tem); |
| 826 | 4261 Charcount size = string_char_length (tem); |
| 438 | 4262 |
| 4263 if (size <= *offset) | |
| 4264 *offset -= size; | |
| 4265 else | |
| 4266 { | |
| 867 | 4267 const Ibyte *tmp_str = itext_n_addr (str, *offset); |
| 438 | 4268 |
| 440 | 4269 /* #### NOTE: I don't understand why a tmp_max is not |
| 438 | 4270 computed and used here as in the plain string case |
| 4271 above. -- dv */ | |
| 4272 pos = add_string_to_fstring_db_runes (data, tmp_str, pos, | |
| 4273 min_pos, max_pos); | |
| 4274 *offset = 0; | |
| 4275 } | |
| 4187 | 4276 } |
| 4277 /* Give up right away for nil or t. */ | |
| 4278 else if (!EQ (tem, elt)) | |
| 4279 { | |
| 4280 elt = tem; | |
| 4281 goto tail_recurse; | |
| 4282 } | |
| 4283 } | |
| 428 | 4284 } |
| 4285 else if (GENERIC_SPECIFIERP (elt)) | |
| 4286 { | |
| 4287 Lisp_Object window, tem; | |
| 793 | 4288 window = wrap_window (w); |
| 428 | 4289 tem = specifier_instance_no_quit (elt, Qunbound, window, |
| 793 | 4290 ERROR_ME_DEBUG_WARN, 0, Qzero); |
| 428 | 4291 if (!UNBOUNDP (tem)) |
| 4292 { | |
| 4293 elt = tem; | |
| 4294 goto tail_recurse; | |
| 4295 } | |
| 4296 } | |
| 4297 else if (CONSP (elt)) | |
| 4298 { | |
| 4299 /* A cons cell: four distinct cases. | |
| 438 | 4300 * - If first element is a string or a cons, process all the elements |
| 4301 * and effectively concatenate them. | |
| 4302 * - If first element is a negative number, truncate displaying cdr to | |
| 4303 * at most that many characters. If positive, pad (with spaces) | |
| 4304 * to at least that many characters. | |
| 771 | 4305 * - If first element is another symbol or a boolean specifier, process |
| 4306 * the cadr or caddr recursively according to whether the symbol's | |
| 4307 * value or specifier's instance is non-nil or nil. | |
| 4308 * - If first element is , process the cadr or caddr | |
| 4309 * recursively according to whether the instance of the specifier in | |
| 4310 * the modeline's window is non-nil or nil. | |
| 442 | 4311 * - If first element is an extent, process the cdr recursively |
| 4312 * and handle the extent's face. | |
| 428 | 4313 */ |
| 438 | 4314 |
| 428 | 4315 Lisp_Object car, tem; |
| 4316 | |
| 4317 car = XCAR (elt); | |
| 771 | 4318 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car)) |
| 438 | 4319 { |
| 4320 elt = XCDR (elt); | |
| 4321 if (!CONSP (elt)) | |
| 4322 goto invalid; | |
| 4323 | |
| 771 | 4324 if (SYMBOLP (car)) |
| 4325 tem = symbol_value_in_buffer (car, w->buffer); | |
| 4326 else | |
| 4327 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w), | |
| 793 | 4328 ERROR_ME_DEBUG_WARN, 0, Qzero); |
| 438 | 4329 /* elt is now the cdr, and we know it is a cons cell. |
| 4330 Use its car if CAR has a non-nil value. */ | |
| 771 | 4331 if (!UNBOUNDP (tem) && !NILP (tem)) |
| 438 | 4332 { |
| 771 | 4333 elt = XCAR (elt); |
| 4334 goto tail_recurse; | |
| 438 | 4335 } |
| 771 | 4336 /* Symbol's value or specifier's instance is nil or unbound |
| 438 | 4337 * Get the cddr of the original list |
| 4338 * and if possible find the caddr and use that. | |
| 4339 */ | |
| 4340 elt = XCDR (elt); | |
| 4341 if (NILP (elt)) | |
| 4342 ; | |
| 4343 else if (!CONSP (elt)) | |
| 4344 goto invalid; | |
| 4345 else | |
| 4346 { | |
| 4347 elt = XCAR (elt); | |
| 4348 goto tail_recurse; | |
| 4349 } | |
| 4350 } | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
4351 else if (FIXNUMP (car)) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
4352 { |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
4353 Charcount lim = XFIXNUM (car); |
| 4187 | 4354 |
| 4355 elt = XCDR (elt); | |
| 4356 | |
| 4357 if (lim < 0) | |
| 4358 { | |
| 4359 /* Negative int means reduce maximum width. | |
| 4360 * DO NOT change MIN_PIXPOS here! | |
| 4361 * (20 -10 . foo) should truncate foo to 10 col | |
| 4362 * and then pad to 20. | |
| 4363 */ | |
| 4364 if (max_pos == -1) | |
| 4365 max_pos = pos - lim; | |
| 4366 else | |
| 4367 max_pos = min (max_pos, pos - lim); | |
| 4368 } | |
| 4369 else if (lim > 0) | |
| 4370 { | |
| 4371 /* Padding specified. Don't let it be more than | |
| 4372 * current maximum. | |
| 4373 */ | |
| 4374 lim += pos; | |
| 4375 if (max_pos != -1 && lim > max_pos) | |
| 4376 lim = max_pos; | |
| 4377 /* If that's more padding than already wanted, queue it. | |
| 4378 * But don't reduce padding already specified even if | |
| 4379 * that is beyond the current truncation point. | |
| 4380 */ | |
| 4381 if (lim > min_pos) | |
| 4382 min_pos = lim; | |
| 4383 } | |
| 4384 goto tail_recurse; | |
| 4385 } | |
| 428 | 4386 else if (STRINGP (car) || CONSP (car)) |
| 4187 | 4387 { |
| 4388 int limit = 50; | |
| 4389 | |
| 4390 /* LIMIT is to protect against circular lists. */ | |
| 4391 while (CONSP (elt) && --limit > 0 | |
| 4392 && (pos < max_pos || max_pos == -1)) | |
| 4393 { | |
| 4394 pos = generate_fstring_runes (w, data, pos, pos, max_pos, | |
| 4395 XCAR (elt), depth, max_pixsize, | |
| 438 | 4396 findex, type, offset, cur_ext); |
| 4187 | 4397 elt = XCDR (elt); |
| 4398 } | |
| 4399 } | |
| 428 | 4400 else if (EXTENTP (car)) |
| 4187 | 4401 { |
| 4402 struct extent *ext = XEXTENT (car); | |
| 4403 | |
| 4404 if (EXTENT_LIVE_P (ext)) | |
| 4405 { | |
| 4406 face_index old_findex = data->findex; | |
| 4407 Lisp_Object face; | |
| 4408 Lisp_Object font_inst; | |
| 4409 face_index new_findex; | |
| 4410 Bytecount start = data->bytepos; | |
| 4411 | |
| 4412 face = extent_face (ext); | |
| 4413 if (FACEP (face)) | |
| 4414 { | |
| 4415 /* #### needs to merge faces, sigh */ | |
| 4416 /* #### needs to handle list of faces */ | |
| 4417 new_findex = get_builtin_face_cache_index (w, face); | |
| 4418 /* !!#### not right; needs to compute the max height of | |
| 4419 all the charsets */ | |
| 4420 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex, | |
| 4421 Vcharset_ascii); | |
| 4422 | |
| 4423 data->dl->ascent = max (data->dl->ascent, | |
| 4424 XFONT_INSTANCE (font_inst)->ascent); | |
| 4425 data->dl->descent = max (data->dl->descent, | |
| 4426 XFONT_INSTANCE (font_inst)-> | |
| 4427 descent); | |
| 4428 } | |
| 4429 else | |
| 4430 new_findex = old_findex; | |
| 4431 | |
| 4432 data->findex = new_findex; | |
| 4433 pos = generate_fstring_runes (w, data, pos, pos, max_pos, | |
| 4434 XCDR (elt), depth - 1, | |
| 438 | 4435 max_pixsize, new_findex, type, |
| 4436 offset, car); | |
| 4187 | 4437 data->findex = old_findex; |
| 4438 Dynarr_add (formatted_string_extent_dynarr, ext); | |
| 4439 Dynarr_add (formatted_string_extent_start_dynarr, start); | |
| 4440 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos); | |
| 4441 } | |
| 4442 } | |
| 428 | 4443 } |
| 4444 else if (GLYPHP (elt)) | |
| 4445 { | |
| 438 | 4446 /* Glyphs are considered as one character with respect to the modeline |
| 4447 horizontal scrolling facility. -- dv */ | |
| 4448 if (*offset > 0) | |
| 4449 *offset -= 1; | |
| 4450 else | |
| 4451 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos, | |
| 4452 cur_ext); | |
| 428 | 4453 } |
| 4454 else | |
| 4455 { | |
| 4456 invalid: | |
| 438 | 4457 { |
| 4970 | 4458 const Ascbyte *str = GETTEXT ("*invalid*"); |
| 438 | 4459 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */ |
| 4460 | |
| 4461 if (size <= *offset) | |
| 4462 *offset -= size; | |
| 4463 else | |
| 4464 { | |
| 867 | 4465 const Ibyte *tmp_str = |
| 4466 itext_n_addr ((const Ibyte *) str, *offset); | |
| 438 | 4467 |
| 440 | 4468 /* #### NOTE: I don't understand why a tmp_max is not computed and |
| 438 | 4469 used here as in the plain string case above. -- dv */ |
| 4470 pos = add_string_to_fstring_db_runes (data, tmp_str, pos, | |
| 4471 min_pos, max_pos); | |
| 4472 *offset = 0; | |
| 4473 } | |
| 4474 } | |
| 428 | 4475 } |
| 4476 | |
| 4477 if (min_pos > pos) | |
| 4478 { | |
| 867 | 4479 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos, |
| 438 | 4480 min_pos, -1); |
| 428 | 4481 } |
| 4482 | |
| 4483 return pos; | |
| 4484 } | |
| 4485 | |
| 4486 /* Update just the modeline. Assumes the desired display structs. If | |
| 4487 they do not have a modeline block, it does nothing. */ | |
| 4488 static void | |
| 4489 regenerate_modeline (struct window *w) | |
| 4490 { | |
| 4491 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP); | |
| 4492 | |
| 4967 | 4493 if (!Dynarr_length (dla) || !Dynarr_begin (dla)->modeline) |
| 428 | 4494 return; |
| 4495 else | |
| 4496 { | |
| 4967 | 4497 generate_modeline (w, Dynarr_begin (dla), DESIRED_DISP); |
| 428 | 4498 redisplay_update_line (w, 0, 0, 0); |
| 4499 } | |
| 4500 } | |
| 4501 | |
| 4502 /* Make sure that modeline display line is present in the given | |
| 4503 display structs if the window has a modeline and update that | |
| 4504 line. Returns true if a modeline was needed. */ | |
| 4505 static int | |
| 4506 ensure_modeline_generated (struct window *w, int type) | |
| 4507 { | |
| 4508 int need_modeline; | |
| 4509 | |
| 4510 /* minibuffer windows don't have modelines */ | |
| 4511 if (MINI_WINDOW_P (w)) | |
| 4512 need_modeline = 0; | |
| 4513 /* windows which haven't had it turned off do */ | |
| 4514 else if (WINDOW_HAS_MODELINE_P (w)) | |
| 4515 need_modeline = 1; | |
| 4516 /* windows which have it turned off don't have a divider if there is | |
| 4517 a horizontal scrollbar */ | |
| 4518 else if (window_scrollbar_height (w)) | |
| 4519 need_modeline = 0; | |
| 4520 /* and in this case there is none */ | |
| 4521 else | |
| 4522 need_modeline = 1; | |
| 4523 | |
| 4524 if (need_modeline) | |
| 4525 { | |
| 4526 display_line_dynarr *dla; | |
| 4527 | |
| 4528 dla = window_display_lines (w, type); | |
| 4529 | |
| 4530 /* We don't care if there is a display line which is not | |
| 4187 | 4531 currently a modeline because it is definitely going to become |
| 4532 one if we have gotten to this point. */ | |
| 428 | 4533 if (Dynarr_length (dla) == 0) |
| 4534 { | |
| 4535 if (Dynarr_largest (dla) > 0) | |
| 5038 | 4536 Dynarr_incrementr (dla); |
| 428 | 4537 else |
| 4538 { | |
| 4539 struct display_line modeline; | |
| 4207 | 4540 |
| 4541 DISPLAY_LINE_INIT (modeline); | |
| 428 | 4542 Dynarr_add (dla, modeline); |
| 4543 } | |
| 4544 } | |
| 4545 | |
| 4546 /* If we're adding a new place marker go ahead and generate the | |
| 4187 | 4547 modeline so that it is available for use by |
| 4548 window_modeline_height. */ | |
| 4967 | 4549 generate_modeline (w, Dynarr_begin (dla), type); |
| 428 | 4550 } |
| 4551 | |
| 4552 return need_modeline; | |
| 4553 } | |
| 4554 | |
| 4555 /* #### Kludge or not a kludge. I tend towards the former. */ | |
| 4556 int | |
| 4557 real_current_modeline_height (struct window *w) | |
| 4558 { | |
| 4559 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer); | |
| 4560 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer); | |
| 4561 | |
| 4562 if (ensure_modeline_generated (w, CMOTION_DISP)) | |
| 4563 { | |
| 4564 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP); | |
| 4565 | |
| 4566 if (Dynarr_length (dla)) | |
| 4567 { | |
| 4967 | 4568 if (Dynarr_begin (dla)->modeline) |
| 4569 return (Dynarr_begin (dla)->ascent + | |
| 4570 Dynarr_begin (dla)->descent); | |
| 428 | 4571 } |
| 4572 } | |
| 4573 return 0; | |
| 4574 } | |
| 4575 | |
| 4576 | |
| 4577 /***************************************************************************/ | |
| 819 | 4578 /* */ |
| 826 | 4579 /* displayable string routines */ |
| 819 | 4580 /* */ |
| 428 | 4581 /***************************************************************************/ |
| 4582 | |
| 4583 /* Given a position for a string in a window, ensure that the given | |
| 4584 display line DL accurately represents the text on a line starting | |
| 4585 at the given position. | |
| 4586 | |
| 4587 Yes, this is duplicating the code of create_text_block, but it | |
| 4588 looked just too hard to change create_text_block to handle strings | |
| 4589 *and* buffers. We already make a distinction between the two | |
| 4590 elsewhere in the code so I think unifying them would require a | |
| 4591 complete MULE rewrite. Besides, the other distinction is that these | |
| 4592 functions cover text that the user *cannot edit* so we can remove | |
| 4593 everything to do with cursors, minibuffers etc. Eventually the | |
| 4594 modeline routines should be modified to use this code as it copes | |
| 4595 with many more types of display situation. */ | |
| 4596 | |
| 665 | 4597 static Charbpos |
| 428 | 4598 create_string_text_block (struct window *w, Lisp_Object disp_string, |
| 4599 struct display_line *dl, | |
| 826 | 4600 Charcount start_pos, |
| 428 | 4601 prop_block_dynarr **prop, |
| 4602 face_index default_face) | |
| 4603 { | |
| 4604 struct frame *f = XFRAME (w->frame); | |
| 4605 /* Note that a lot of the buffer controlled stuff has been left in | |
| 4606 because you might well want to make use of it (selective display | |
| 4607 etc), its just the buffer text that we do not use. However, it | |
| 4608 seems to be possible for buffer to be nil sometimes so protect | |
| 4609 against this case. */ | |
| 4610 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0; | |
| 4611 struct device *d = XDEVICE (f->device); | |
| 4612 | |
| 4613 /* we're working with these a lot so precalculate them */ | |
| 4614 Bytecount slen = XSTRING_LENGTH (disp_string); | |
| 826 | 4615 Bytecount byte_string_zv = slen; |
| 4616 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos); | |
| 428 | 4617 |
| 4618 pos_data data; | |
| 4619 | |
| 4620 int truncate_win = b ? window_truncation_on (w) : 0; | |
| 4621 | |
| 442 | 4622 /* We're going to ditch selective display for static text, it's an |
| 4623 FSF thing and invisible extents are the way to go here. | |
| 4624 Implementing it also relies on a number of buffer-specific | |
| 428 | 4625 functions that we don't have the luxury of being able to use |
| 4626 here. */ | |
| 4627 | |
| 4628 /* The variable ctl-arrow allows the user to specify what characters | |
| 4629 can actually be displayed and which octal should be used for. | |
| 4630 #### This variable should probably have some rethought done to | |
| 4631 it. | |
| 4632 | |
| 4633 #### It would also be really nice if you could specify that | |
| 4634 the characters come out in hex instead of in octal. Mule | |
| 4635 does that by adding a ctl-hexa variable similar to ctl-arrow, | |
| 4636 but that's bogus -- we need a more general solution. I | |
| 4637 think you need to extend the concept of display tables | |
| 4638 into a more general conversion mechanism. Ideally you | |
| 4639 could specify a Lisp function that converts characters, | |
| 4640 but this violates the Second Golden Rule and besides would | |
| 4641 make things way way way way slow. | |
| 4642 | |
| 4643 So instead, we extend the display-table concept, which was | |
| 4644 historically limited to 256-byte vectors, to one of the | |
| 4645 following: | |
| 4646 | |
| 4647 a) A 256-entry vector, for backward compatibility; | |
| 4648 b) char-table, mapping characters to values; | |
| 4649 c) range-table, mapping ranges of characters to values; | |
| 4650 d) a list of the above. | |
| 4651 | |
| 4652 The (d) option allows you to specify multiple display tables | |
| 4653 instead of just one. Each display table can specify conversions | |
| 4654 for some characters and leave others unchanged. The way the | |
| 4655 character gets displayed is determined by the first display table | |
| 4656 with a binding for that character. This way, you could call a | |
| 4657 function `enable-hex-display' that adds a hex display-table to | |
| 4658 the list of display tables for the current buffer. | |
| 4659 | |
| 4660 #### ...not yet implemented... Also, we extend the concept of | |
| 4661 "mapping" to include a printf-like spec. Thus you can make all | |
| 4662 extended characters show up as hex with a display table like | |
| 4663 this: | |
| 4664 | |
| 4187 | 4665 #s(range-table data ((256 524288) (format "%x"))) |
| 428 | 4666 |
| 4667 Since more than one display table is possible, you have | |
| 4668 great flexibility in mapping ranges of characters. */ | |
| 867 | 4669 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow) |
| 428 | 4670 ? XCHAR_OR_CHAR_INT (b->ctl_arrow) |
| 4671 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil)) | |
| 4672 ? 255 : 160)) : 255; | |
| 4673 | |
| 4674 Lisp_Object face_dt, window_dt; | |
| 4675 | |
| 4676 /* The text display block for this display line. */ | |
| 4677 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 4678 | |
| 4679 /* The first time through the main loop we need to force the glyph | |
| 4680 data to be updated. */ | |
| 4681 int initial = 1; | |
| 4682 | |
| 4683 /* Apparently the new extent_fragment_update returns an end position | |
| 4684 equal to the position passed in if there are no more runs to be | |
| 4685 displayed. */ | |
| 4686 int no_more_frags = 0; | |
| 4687 | |
| 4688 dl->used_prop_data = 0; | |
| 4689 dl->num_chars = 0; | |
| 442 | 4690 dl->line_continuation = 0; |
| 428 | 4691 |
| 4187 | 4692 /* Set up faces to use for clearing areas, used by output_display_line. */ |
| 428 | 4693 dl->default_findex = default_face; |
| 4187 | 4694 if (default_face > DEFAULT_INDEX) |
| 428 | 4695 { |
| 4696 dl->left_margin_findex = default_face; | |
| 4697 dl->right_margin_findex = default_face; | |
| 4698 } | |
| 4699 else | |
| 4700 { | |
| 434 | 4701 dl->left_margin_findex = |
| 428 | 4702 get_builtin_face_cache_index (w, Vleft_margin_face); |
| 434 | 4703 dl->right_margin_findex = |
| 428 | 4704 get_builtin_face_cache_index (w, Vright_margin_face); |
| 4705 } | |
| 4706 | |
| 4707 xzero (data); | |
| 4708 data.ef = extent_fragment_new (disp_string, f); | |
| 4709 | |
| 4710 /* These values are used by all of the rune addition routines. We add | |
| 4711 them to this structure for ease of passing. */ | |
| 4712 data.d = d; | |
| 793 | 4713 data.window = wrap_window (w); |
| 428 | 4714 data.db = db; |
| 4715 data.dl = dl; | |
| 4716 | |
| 826 | 4717 data.byte_charpos = byte_start_pos; |
| 428 | 4718 data.pixpos = dl->bounds.left_in; |
| 4719 data.last_charset = Qunbound; | |
| 4720 data.last_findex = default_face; | |
| 4721 data.result_str = Qnil; | |
| 4722 data.string = disp_string; | |
| 4723 | |
| 4724 /* Set the right boundary adjusting it to take into account any end | |
| 4725 glyph. Save the width of the end glyph for later use. */ | |
| 4726 data.max_pixpos = dl->bounds.right_in; | |
| 819 | 4727 data.max_pixpos -= data.end_glyph_width; |
| 428 | 4728 |
| 4729 data.cursor_type = NO_CURSOR; | |
| 4730 data.cursor_x = -1; | |
| 4731 | |
| 4732 data.start_col = 0; | |
| 4733 /* I don't think we want this, string areas should not scroll with | |
| 434 | 4734 the window |
| 428 | 4735 data.start_col = w->hscroll; |
| 826 | 4736 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0); |
| 428 | 4737 */ |
| 826 | 4738 data.byte_start_col_enabled = 0; |
| 428 | 4739 data.hscroll_glyph_width_adjust = 0; |
| 4740 | |
| 4741 /* We regenerate the line from the very beginning. */ | |
| 4742 Dynarr_reset (db->runes); | |
| 4743 | |
| 4744 /* Why is this less than or equal and not just less than? If the | |
| 4745 starting position is already equal to the maximum we can't add | |
| 4746 anything else, right? Wrong. We might still have a newline to | |
| 4747 add. A newline can use the room allocated for an end glyph since | |
| 4748 if we add it we know we aren't going to be adding any end | |
| 4749 glyph. */ | |
| 4750 | |
| 4751 /* #### Chuck -- I think this condition should be while (1). | |
| 4752 Otherwise if (e.g.) there is one begin-glyph and one end-glyph | |
| 4753 and the begin-glyph ends exactly at the end of the window, the | |
| 4754 end-glyph and text might not be displayed. while (1) ensures | |
| 4755 that the loop terminates only when either (a) there is | |
| 4756 propagation data or (b) the end-of-line or end-of-buffer is hit. | |
| 4757 | |
| 4758 #### Also I think you need to ensure that the operation | |
| 4759 "add begin glyphs; add end glyphs; add text" is atomic and | |
| 4760 can't get interrupted in the middle. If you run off the end | |
| 4761 of the line during that operation, then you keep accumulating | |
| 4762 propagation data until you're done. Otherwise, if the (e.g.) | |
| 4763 there's a begin glyph at a particular position and attempting | |
| 4764 to display that glyph results in window-end being hit and | |
| 4765 propagation data being generated, then the character at that | |
| 4766 position won't be displayed. | |
| 4767 | |
| 4768 #### See also the comment after the end of this loop, below. | |
| 4769 */ | |
| 4770 while (data.pixpos <= data.max_pixpos) | |
| 4771 { | |
| 4772 /* #### This check probably should not be necessary. */ | |
| 826 | 4773 if (data.byte_charpos > byte_string_zv) |
| 428 | 4774 { |
| 4775 /* #### urk! More of this lossage! */ | |
| 826 | 4776 data.byte_charpos--; |
| 428 | 4777 goto done; |
| 4778 } | |
| 4779 | |
| 4780 /* Check for face changes. */ | |
| 826 | 4781 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end)) |
| 428 | 4782 { |
| 819 | 4783 Lisp_Object last_glyph = Qnil; |
| 4784 /* Deal with clipped glyphs that we have already displayed. */ | |
| 4967 | 4785 if (*prop && Dynarr_begin (*prop)->type == PROP_GLYPH) |
| 4786 { | |
| 4787 last_glyph = Dynarr_begin (*prop)->data.p_glyph.glyph; | |
| 819 | 4788 Dynarr_free (*prop); |
| 4789 *prop = 0; | |
| 4790 } | |
| 428 | 4791 /* Now compute the face and begin/end-glyph information. */ |
| 4792 data.findex = | |
| 793 | 4793 /* Remember that the extent-fragment routines deal in |
| 4187 | 4794 Bytexpos's. */ |
| 826 | 4795 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph); |
| 428 | 4796 /* This is somewhat cheesy but the alternative is to |
| 4187 | 4797 propagate default_face into extent_fragment_update. */ |
| 428 | 4798 if (data.findex == DEFAULT_INDEX) |
| 4799 data.findex = default_face; | |
| 4800 | |
| 4801 get_display_tables (w, data.findex, &face_dt, &window_dt); | |
| 4802 | |
| 826 | 4803 if (data.byte_charpos == data.ef->end) |
| 428 | 4804 no_more_frags = 1; |
| 4805 } | |
| 4806 initial = 0; | |
| 4807 | |
| 4808 /* Determine what is next to be displayed. We first handle any | |
| 4187 | 4809 glyphs returned by glyphs_at_charbpos. If there are no glyphs to |
| 4810 display then we determine what to do based on the character at the | |
| 4811 current buffer position. */ | |
| 428 | 4812 |
| 4813 /* If the current position is covered by an invisible extent, do | |
| 4187 | 4814 nothing (except maybe add some ellipses). |
| 428 | 4815 |
| 4816 #### The behavior of begin and end-glyphs at the edge of an | |
| 4817 invisible extent should be investigated further. This is | |
| 4818 fairly low priority though. */ | |
| 4819 if (data.ef->invisible) | |
| 4820 { | |
| 4821 /* #### Chuck, perhaps you could look at this code? I don't | |
| 4822 really know what I'm doing. */ | |
| 4823 if (*prop) | |
| 4824 { | |
| 4825 Dynarr_free (*prop); | |
| 4826 *prop = 0; | |
| 4827 } | |
| 4828 | |
| 4829 /* The extent fragment code only sets this when we should | |
| 4830 really display the ellipses. It makes sure the ellipses | |
| 4831 don't get displayed more than once in a row. */ | |
| 4832 if (data.ef->invisible_ellipses) | |
| 4833 { | |
| 4834 struct glyph_block gb; | |
| 4835 | |
| 4836 data.ef->invisible_ellipses_already_displayed = 1; | |
| 4837 data.ef->invisible_ellipses = 0; | |
| 4838 gb.extent = Qnil; | |
| 4839 gb.glyph = Vinvisible_text_glyph; | |
| 4840 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 4841 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 4842 /* Perhaps they shouldn't propagate if the very next thing | |
| 4843 is to display a newline (for compatibility with | |
| 4844 selective-display-ellipses)? Maybe that's too | |
| 4845 abstruse. */ | |
| 4846 if (*prop) | |
| 4847 goto done; | |
| 4848 } | |
| 4849 | |
| 638 | 4850 /* #### What if we're dealing with a display table? */ |
| 428 | 4851 if (data.start_col) |
| 4852 data.start_col--; | |
| 4853 | |
| 826 | 4854 if (data.byte_charpos == byte_string_zv) |
| 428 | 4855 goto done; |
| 4856 else | |
| 826 | 4857 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 4858 } |
| 4859 | |
| 4860 /* If there is propagation data, then it represents the current | |
| 4187 | 4861 buffer position being displayed. Add them and advance the |
| 4862 position counter. This might also add the minibuffer | |
| 4863 prompt. */ | |
| 428 | 4864 else if (*prop) |
| 4865 { | |
| 4866 dl->used_prop_data = 1; | |
| 4867 *prop = add_propagation_runes (prop, &data); | |
| 4868 | |
| 4869 if (*prop) | |
| 4870 goto done; /* gee, a really narrow window */ | |
| 826 | 4871 else if (data.byte_charpos == byte_string_zv) |
| 428 | 4872 goto done; |
| 826 | 4873 else if (data.byte_charpos < 0) |
| 428 | 4874 /* #### urk urk urk! Aborts are not very fun! Fix this please! */ |
| 826 | 4875 data.byte_charpos = 0; |
| 428 | 4876 else |
| 826 | 4877 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 4878 } |
| 4879 | |
| 4880 /* If there are end glyphs, add them to the line. These are | |
| 4881 the end glyphs for the previous run of text. We add them | |
| 4882 here rather than doing them at the end of handling the | |
| 4883 previous run so that glyphs at the beginning and end of | |
| 4884 a line are handled correctly. */ | |
| 4885 else if (Dynarr_length (data.ef->end_glyphs) > 0) | |
| 4886 { | |
| 867 | 4887 data.ch = string_ichar (disp_string, data.byte_charpos); |
| 428 | 4888 *prop = add_glyph_runes (&data, END_GLYPHS); |
| 819 | 4889 |
| 4890 if (*prop) { | |
| 428 | 4891 goto done; |
| 819 | 4892 } |
| 428 | 4893 } |
| 4894 | |
| 4895 /* If there are begin glyphs, add them to the line. */ | |
| 4896 else if (Dynarr_length (data.ef->begin_glyphs) > 0) | |
| 4897 { | |
| 867 | 4898 data.ch = string_ichar (disp_string, data.byte_charpos); |
| 428 | 4899 *prop = add_glyph_runes (&data, BEGIN_GLYPHS); |
| 819 | 4900 |
| 4901 if (*prop) { | |
| 428 | 4902 goto done; |
| 819 | 4903 } |
| 428 | 4904 } |
| 4905 | |
| 4906 /* If at end-of-buffer, we've already processed begin and | |
| 4907 end-glyphs at this point and there's no text to process, | |
| 4908 so we're done. */ | |
| 826 | 4909 else if (data.byte_charpos == byte_string_zv) |
| 428 | 4910 goto done; |
| 4911 | |
| 4912 else | |
| 4913 { | |
| 4914 Lisp_Object entry = Qnil; | |
| 4915 /* Get the character at the current buffer position. */ | |
| 867 | 4916 data.ch = string_ichar (disp_string, data.byte_charpos); |
| 428 | 4917 if (!NILP (face_dt) || !NILP (window_dt)) |
| 4918 entry = display_table_entry (data.ch, face_dt, window_dt); | |
| 4919 | |
| 4920 /* If there is a display table entry for it, hand it off to | |
| 4187 | 4921 add_disp_table_entry_runes and let it worry about it. */ |
| 428 | 4922 if (!NILP (entry) && !EQ (entry, make_char (data.ch))) |
| 4923 { | |
| 4924 *prop = add_disp_table_entry_runes (&data, entry); | |
| 4925 | |
| 4926 if (*prop) | |
| 4927 goto done; | |
| 4928 } | |
| 4929 | |
| 4930 /* Check if we have hit a newline character. If so, add a marker | |
| 4187 | 4931 to the line and end this loop. */ |
| 428 | 4932 else if (data.ch == '\n') |
| 4933 { | |
| 4934 /* We aren't going to be adding an end glyph so give its | |
| 4187 | 4935 space back in order to make sure that the cursor can |
| 4936 fit. */ | |
| 819 | 4937 data.max_pixpos += data.end_glyph_width; |
| 428 | 4938 goto done; |
| 4939 } | |
| 4940 | |
| 4941 /* If the current character is considered to be printable, then | |
| 4187 | 4942 just add it. */ |
| 428 | 4943 else if (data.ch >= printable_min) |
| 4944 { | |
| 867 | 4945 *prop = add_ichar_rune (&data); |
| 428 | 4946 if (*prop) |
| 4947 goto done; | |
| 4948 } | |
| 4949 | |
| 4950 /* If the current character is a tab, determine the next tab | |
| 4187 | 4951 starting position and add a blank rune which extends from the |
| 4952 current pixel position to that starting position. */ | |
| 428 | 4953 else if (data.ch == '\t') |
| 4954 { | |
| 4955 int tab_start_pixpos = data.pixpos; | |
| 4956 int next_tab_start; | |
| 4957 int char_tab_width; | |
| 4958 int prop_width = 0; | |
| 4959 | |
| 4960 if (data.start_col > 1) | |
| 4961 tab_start_pixpos -= (space_width (w) * (data.start_col - 1)); | |
| 4962 | |
| 4963 next_tab_start = | |
| 4964 next_tab_position (w, tab_start_pixpos, | |
| 4965 dl->bounds.left_in + | |
| 4966 data.hscroll_glyph_width_adjust); | |
| 4967 if (next_tab_start > data.max_pixpos) | |
| 4968 { | |
| 4969 prop_width = next_tab_start - data.max_pixpos; | |
| 4970 next_tab_start = data.max_pixpos; | |
| 4971 } | |
| 4972 data.blank_width = next_tab_start - data.pixpos; | |
| 4973 char_tab_width = | |
| 4974 (next_tab_start - tab_start_pixpos) / space_width (w); | |
| 4975 | |
| 4976 *prop = add_blank_rune (&data, w, char_tab_width); | |
| 4977 | |
| 4978 /* add_blank_rune is only supposed to be called with | |
| 819 | 4979 sizes guaranteed to fit in the available space. */ |
| 428 | 4980 assert (!(*prop)); |
| 4981 | |
| 4982 if (prop_width) | |
| 4983 { | |
| 4984 struct prop_block pb; | |
| 4985 *prop = Dynarr_new (prop_block); | |
| 4986 | |
| 4987 pb.type = PROP_BLANK; | |
| 4988 pb.data.p_blank.width = prop_width; | |
| 4989 pb.data.p_blank.findex = data.findex; | |
| 4990 Dynarr_add (*prop, pb); | |
| 4991 | |
| 4992 goto done; | |
| 4993 } | |
| 4994 } | |
| 4995 | |
| 4996 /* If character is a control character, pass it off to | |
| 4187 | 4997 add_control_char_runes. |
| 428 | 4998 |
| 4999 The is_*() routines have undefined results on | |
| 5000 arguments outside of the range [-1, 255]. (This | |
| 5001 often bites people who carelessly use `char' instead | |
| 5002 of `unsigned char'.) | |
| 5003 */ | |
| 867 | 5004 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch)) |
| 428 | 5005 { |
| 5006 *prop = add_control_char_runes (&data, b); | |
| 5007 | |
| 5008 if (*prop) | |
| 5009 goto done; | |
| 5010 } | |
| 5011 | |
| 5012 /* If the character is above the ASCII range and we have not | |
| 4187 | 5013 already handled it, then print it as an octal number. */ |
| 428 | 5014 else if (data.ch >= 0200) |
| 5015 { | |
| 5016 *prop = add_octal_runes (&data); | |
| 5017 | |
| 5018 if (*prop) | |
| 5019 goto done; | |
| 5020 } | |
| 5021 | |
| 5022 /* Assume the current character is considered to be printable, | |
| 4187 | 5023 then just add it. */ |
| 428 | 5024 else |
| 5025 { | |
| 867 | 5026 *prop = add_ichar_rune (&data); |
| 428 | 5027 if (*prop) |
| 5028 goto done; | |
| 5029 } | |
| 5030 | |
| 826 | 5031 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 5032 } |
| 5033 } | |
| 5034 | |
| 819 | 5035 done: |
| 428 | 5036 |
| 5037 /* Determine the starting point of the next line if we did not hit the | |
| 5038 end of the buffer. */ | |
| 826 | 5039 if (data.byte_charpos < byte_string_zv) |
| 428 | 5040 { |
| 5041 /* #### This check is not correct. If the line terminated | |
| 5042 due to a begin-glyph or end-glyph hitting window-end, then | |
| 826 | 5043 data.ch will not point to the character at data.byte_charpos. If |
| 428 | 5044 you make the two changes mentioned at the top of this loop, |
| 5045 you should be able to say '(if (*prop))'. That should also | |
| 826 | 5046 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b) |
| 428 | 5047 check. */ |
| 5048 | |
| 5049 /* The common case is that the line ended because we hit a newline. | |
| 4187 | 5050 In that case, the next character is just the next buffer |
| 5051 position. */ | |
| 428 | 5052 if (data.ch == '\n') |
| 5053 { | |
| 826 | 5054 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 5055 } |
| 5056 | |
| 5057 /* Otherwise we have a buffer line which cannot fit on one display | |
| 4187 | 5058 line. */ |
| 428 | 5059 else |
| 5060 { | |
| 5061 struct glyph_block gb; | |
| 5062 struct glyph_cachel *cachel; | |
| 5063 | |
| 5064 /* If the line is to be truncated then we actually have to look | |
| 4187 | 5065 for the next newline. We also add the end-of-line glyph which |
| 5066 we know will fit because we adjusted the right border before | |
| 5067 we starting laying out the line. */ | |
| 819 | 5068 data.max_pixpos += data.end_glyph_width; |
| 428 | 5069 data.findex = default_face; |
| 5070 gb.extent = Qnil; | |
| 5071 | |
| 5072 if (truncate_win) | |
| 5073 { | |
| 826 | 5074 Bytecount byte_pos; |
| 428 | 5075 |
| 5076 /* Now find the start of the next line. */ | |
| 867 | 5077 byte_pos = byte_find_next_ichar_in_string (disp_string, '\n', |
| 826 | 5078 data.byte_charpos, 1); |
| 428 | 5079 |
| 5080 data.cursor_type = NO_CURSOR; | |
| 826 | 5081 data.byte_charpos = byte_pos; |
| 428 | 5082 gb.glyph = Vtruncation_glyph; |
| 5083 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX); | |
| 5084 } | |
| 5085 else | |
| 5086 { | |
| 5087 /* The cursor can never be on the continuation glyph. */ | |
| 5088 data.cursor_type = NO_CURSOR; | |
| 5089 | |
| 826 | 5090 /* data.byte_charpos is already at the start of the next line. */ |
| 428 | 5091 |
| 442 | 5092 dl->line_continuation = 1; |
| 428 | 5093 gb.glyph = Vcontinuation_glyph; |
| 5094 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX); | |
| 5095 } | |
| 5096 | |
| 819 | 5097 if (data.end_glyph_width) |
| 428 | 5098 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel); |
| 5099 | |
| 826 | 5100 if (truncate_win && data.byte_charpos == byte_string_zv) |
| 428 | 5101 { |
| 867 | 5102 const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string), |
| 826 | 5103 byte_string_zv); |
| 867 | 5104 DEC_IBYTEPTR (endb); |
| 5105 if (itext_ichar (endb) != '\n') | |
| 428 | 5106 { |
| 5107 /* #### Damn this losing shit. */ | |
| 826 | 5108 data.byte_charpos++; |
| 428 | 5109 } |
| 5110 } | |
| 5111 } | |
| 5112 } | |
| 826 | 5113 else if (data.byte_charpos == byte_string_zv) |
| 428 | 5114 { |
| 5115 /* create_text_block () adds a bogus \n marker here which screws | |
| 5116 up subwindow display. Since we never have a cursor in the | |
| 5117 gutter we can safely ignore it. */ | |
| 5118 } | |
| 5119 /* Calculate left whitespace boundary. */ | |
| 5120 { | |
| 5121 int elt = 0; | |
| 5122 | |
| 5123 /* Whitespace past a newline is considered right whitespace. */ | |
| 5124 while (elt < Dynarr_length (db->runes)) | |
| 5125 { | |
| 5126 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 5127 | |
| 5128 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ') | |
| 5129 || rb->type == RUNE_BLANK) | |
| 5130 { | |
| 5131 dl->bounds.left_white += rb->width; | |
| 5132 elt++; | |
| 5133 } | |
| 5134 else | |
| 5135 elt = Dynarr_length (db->runes); | |
| 5136 } | |
| 5137 } | |
| 5138 | |
| 5139 /* Calculate right whitespace boundary. */ | |
| 5140 { | |
| 5141 int elt = Dynarr_length (db->runes) - 1; | |
| 5142 int done = 0; | |
| 5143 | |
| 5144 while (!done && elt >= 0) | |
| 5145 { | |
| 5146 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 5147 | |
| 5148 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100 | |
| 5149 && isspace (rb->object.chr.ch)) | |
| 5150 && !rb->type == RUNE_BLANK) | |
| 5151 { | |
| 5152 dl->bounds.right_white = rb->xpos + rb->width; | |
| 5153 done = 1; | |
| 5154 } | |
| 5155 | |
| 5156 elt--; | |
| 5157 | |
| 5158 } | |
| 5159 | |
| 5160 /* The line is blank so everything is considered to be right | |
| 5161 whitespace. */ | |
| 5162 if (!done) | |
| 5163 dl->bounds.right_white = dl->bounds.left_in; | |
| 5164 } | |
| 5165 | |
| 5166 /* Set the display blocks bounds. */ | |
| 5167 db->start_pos = dl->bounds.left_in; | |
| 5168 if (Dynarr_length (db->runes)) | |
| 5169 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
5170 struct rune *rb = Dynarr_lastp (db->runes); |
| 428 | 5171 |
| 5172 db->end_pos = rb->xpos + rb->width; | |
| 5173 } | |
| 5174 else | |
| 5175 db->end_pos = dl->bounds.right_white; | |
| 5176 | |
| 819 | 5177 calculate_baseline (&data); |
| 428 | 5178 |
| 5179 dl->ascent = data.new_ascent; | |
| 5180 dl->descent = data.new_descent; | |
| 5181 | |
| 5182 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5183 unsigned short ascent = (unsigned short) XFIXNUM (w->minimum_line_ascent); |
| 428 | 5184 |
| 5185 if (dl->ascent < ascent) | |
| 5186 dl->ascent = ascent; | |
| 5187 } | |
| 5188 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5189 unsigned short descent = (unsigned short) XFIXNUM (w->minimum_line_descent); |
| 428 | 5190 |
| 5191 if (dl->descent < descent) | |
| 5192 dl->descent = descent; | |
| 5193 } | |
| 5194 | |
| 819 | 5195 calculate_yoffset (dl, db); |
| 5196 | |
| 428 | 5197 dl->cursor_elt = data.cursor_x; |
| 5198 /* #### lossage lossage lossage! Fix this shit! */ | |
| 826 | 5199 if (data.byte_charpos > byte_string_zv) |
| 5200 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string, | |
| 5201 byte_string_zv); | |
| 428 | 5202 else |
| 826 | 5203 dl->end_charpos = |
| 5204 buffer_or_string_bytexpos_to_charxpos (disp_string, | |
| 5205 data.byte_charpos) - 1; | |
| 428 | 5206 if (truncate_win) |
| 434 | 5207 data.dl->num_chars = |
| 826 | 5208 string_column_at_point (disp_string, dl->end_charpos, |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5209 b ? XFIXNUM (b->tab_width) : 8); |
| 428 | 5210 else |
| 5211 /* This doesn't correctly take into account tabs and control | |
| 5212 characters but if the window isn't being truncated then this | |
| 5213 value isn't going to end up being used anyhow. */ | |
| 826 | 5214 data.dl->num_chars = dl->end_charpos - dl->charpos; |
| 428 | 5215 |
| 5216 /* #### handle horizontally scrolled line with text none of which | |
| 5217 was actually laid out. */ | |
| 5218 | |
| 5219 /* #### handle any remainder of overlay arrow */ | |
| 5220 | |
| 5221 if (*prop == ADD_FAILED) | |
| 5222 *prop = NULL; | |
| 5223 | |
| 5224 if (truncate_win && *prop) | |
| 5225 { | |
| 5226 Dynarr_free (*prop); | |
| 5227 *prop = NULL; | |
| 5228 } | |
| 5229 | |
| 5230 extent_fragment_delete (data.ef); | |
| 5231 | |
| 5232 /* #### If we started at EOB, then make sure we return a value past | |
| 5233 it so that regenerate_window will exit properly. This is bogus. | |
| 5234 The main loop should get fixed so that it isn't necessary to call | |
| 5235 this function if we are already at EOB. */ | |
| 5236 | |
| 826 | 5237 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv) |
| 793 | 5238 return string_index_byte_to_char (disp_string, |
| 826 | 5239 data.byte_charpos) + 1; /* Yuck! */ |
| 428 | 5240 else |
| 826 | 5241 return string_index_byte_to_char (disp_string, data.byte_charpos); |
| 428 | 5242 } |
| 5243 | |
| 5244 /* Given a display line and a starting position, ensure that the | |
| 5245 contents of the display line accurately represent the visual | |
| 5246 representation of the buffer contents starting from the given | |
| 5247 position when displayed in the given window. The display line ends | |
| 5248 when the contents of the line reach the right boundary of the given | |
| 434 | 5249 window. |
| 5250 | |
| 428 | 5251 This is very similar to generate_display_line but with the same |
| 5252 limitations as create_string_text_block. I have taken the liberty | |
| 665 | 5253 of fixing the bytebpos stuff though.*/ |
| 5254 | |
| 5255 static Charbpos | |
| 428 | 5256 generate_string_display_line (struct window *w, Lisp_Object disp_string, |
| 5257 struct display_line *dl, | |
| 826 | 5258 Charcount start_pos, |
| 428 | 5259 prop_block_dynarr **prop, |
| 5260 face_index default_face) | |
| 5261 { | |
| 826 | 5262 Charcount ret_charcount; |
| 428 | 5263 |
| 5264 /* you must set bounds before calling this. */ | |
| 434 | 5265 |
| 428 | 5266 /* Reset what this line is using. */ |
| 5267 if (dl->display_blocks) | |
| 5268 Dynarr_reset (dl->display_blocks); | |
| 5269 if (dl->left_glyphs) | |
| 5270 { | |
| 5271 Dynarr_free (dl->left_glyphs); | |
| 5272 dl->left_glyphs = 0; | |
| 5273 } | |
| 5274 if (dl->right_glyphs) | |
| 5275 { | |
| 5276 Dynarr_free (dl->right_glyphs); | |
| 5277 dl->right_glyphs = 0; | |
| 5278 } | |
| 5279 | |
| 5280 /* We aren't generating a modeline at the moment. */ | |
| 5281 dl->modeline = 0; | |
| 5282 | |
| 5283 /* Create a display block for the text region of the line. */ | |
| 826 | 5284 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos, |
| 5285 prop, default_face); | |
| 5286 dl->charpos = start_pos; | |
| 5287 if (dl->end_charpos < dl->charpos) | |
| 5288 dl->end_charpos = dl->charpos; | |
| 428 | 5289 |
| 5290 /* If there are left glyphs associated with any character in the | |
| 5291 text block, then create a display block to handle them. */ | |
| 5292 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs)) | |
| 5293 create_left_glyph_block (w, dl, 0); | |
| 5294 | |
| 5295 /* If there are right glyphs associated with any character in the | |
| 5296 text block, then create a display block to handle them. */ | |
| 5297 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs)) | |
| 5298 create_right_glyph_block (w, dl); | |
| 5299 | |
| 826 | 5300 return ret_charcount; |
| 428 | 5301 } |
| 5302 | |
| 2518 | 5303 /* |
| 5304 | |
| 5038 | 5305 Info on reentrancy crashes, with backtraces given: |
| 5306 | |
| 5307 (Info-goto-node "(internals)Critical Redisplay Sections") | |
| 5308 | |
| 1318 | 5309 */ |
| 5310 | |
| 5311 | |
| 428 | 5312 /* This is ripped off from regenerate_window. All we want to do is |
| 5313 loop through elements in the string creating display lines until we | |
| 5314 have covered the provided area. Simple really. */ | |
| 5315 void | |
| 5316 generate_displayable_area (struct window *w, Lisp_Object disp_string, | |
| 5317 int xpos, int ypos, int width, int height, | |
| 5318 display_line_dynarr* dla, | |
| 826 | 5319 Charcount start_pos, |
| 428 | 5320 face_index default_face) |
| 5321 { | |
| 5322 int yend = ypos + height; | |
| 5323 Charcount s_zv; | |
| 5324 prop_block_dynarr *prop = 0; | |
| 5325 layout_bounds bounds; | |
| 2518 | 5326 int depth = -1; |
| 5327 | |
| 428 | 5328 /* if there's nothing to do then do nothing. code after this assumes |
| 5329 there is something to do. */ | |
| 5330 if (NILP (disp_string)) | |
| 5331 return; | |
| 5332 | |
| 2518 | 5333 /* See comment in regenerate_window() */ |
| 5334 if (!in_display) | |
| 5335 depth = enter_redisplay_critical_section (); | |
| 5336 | |
| 5337 assert (dla); | |
| 5338 Dynarr_reset (dla); | |
| 5339 | |
| 826 | 5340 s_zv = string_char_length (disp_string); |
| 428 | 5341 |
| 5342 bounds.left_out = xpos; | |
| 5343 bounds.right_out = xpos + width; | |
| 5344 /* The inner boundaries mark where the glyph margins are located. */ | |
| 5345 bounds.left_in = bounds.left_out + window_left_margin_width (w); | |
| 5346 bounds.right_in = bounds.right_out - window_right_margin_width (w); | |
| 5347 /* We cannot fully calculate the whitespace boundaries as they | |
| 5348 depend on the contents of the line being displayed. */ | |
| 5349 bounds.left_white = bounds.left_in; | |
| 5350 bounds.right_white = bounds.right_in; | |
| 5351 | |
| 5352 while (ypos < yend) | |
| 5353 { | |
| 5354 struct display_line dl; | |
| 5355 struct display_line *dlp; | |
| 826 | 5356 Charcount next_pos; |
| 428 | 5357 int local; |
| 851 | 5358 int pos_of_dlp = -1; |
| 428 | 5359 |
| 5360 if (Dynarr_length (dla) < Dynarr_largest (dla)) | |
| 5361 { | |
| 851 | 5362 pos_of_dlp = Dynarr_length (dla); |
| 5363 dlp = Dynarr_atp (dla, pos_of_dlp); | |
| 428 | 5364 local = 0; |
| 5365 } | |
| 5366 else | |
| 5367 { | |
| 4207 | 5368 DISPLAY_LINE_INIT (dl); |
| 428 | 5369 dlp = &dl; |
| 5370 local = 1; | |
| 5371 } | |
| 5372 | |
| 5373 dlp->bounds = bounds; | |
| 5374 dlp->offset = 0; | |
| 1318 | 5375 Dynarr_lock (dla); |
| 428 | 5376 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos, |
| 5377 &prop, default_face); | |
| 1318 | 5378 Dynarr_unlock (dla); |
| 428 | 5379 /* we need to make sure that we continue along the line if there |
| 4187 | 5380 is more left to display otherwise we just end up redisplaying |
| 5381 the same chunk over and over again. */ | |
| 428 | 5382 if (next_pos == start_pos && next_pos < s_zv) |
| 5383 start_pos++; | |
| 5384 else | |
| 5385 start_pos = next_pos; | |
| 5386 | |
| 5387 dlp->ypos = ypos + dlp->ascent; | |
| 5388 ypos = dlp->ypos + dlp->descent; | |
| 5389 | |
| 5390 if (ypos > yend) | |
| 5391 { | |
| 5392 int visible_height = dlp->ascent + dlp->descent; | |
| 5393 | |
| 5394 dlp->clip = (ypos - yend); | |
| 5395 visible_height -= dlp->clip; | |
| 5396 | |
| 5397 if (visible_height < VERTICAL_CLIP (w, 1)) | |
| 5398 { | |
| 5399 if (local) | |
| 5400 free_display_line (dlp); | |
| 5401 break; | |
| 5402 } | |
| 5403 } | |
| 5404 else | |
| 5405 dlp->clip = 0; | |
| 5406 | |
|
4418
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5407 if (pos_of_dlp < 0) |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5408 Dynarr_add (dla, *dlp); |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5409 else if (pos_of_dlp == Dynarr_length (dla)) |
| 5038 | 5410 Dynarr_incrementr (dla); |
|
4418
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5411 else |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5412 ABORT (); |
| 428 | 5413 |
| 5414 /* #### This type of check needs to be done down in the | |
| 5415 generate_display_line call. */ | |
| 5416 if (start_pos >= s_zv) | |
| 5417 break; | |
| 5418 } | |
| 5419 | |
| 5420 if (prop) | |
| 5421 Dynarr_free (prop); | |
| 2518 | 5422 |
| 5423 if (depth >= 0) | |
| 5424 exit_redisplay_critical_section (depth); | |
| 428 | 5425 } |
| 5426 | |
| 5427 | |
| 5428 /***************************************************************************/ | |
| 5429 /* */ | |
| 5430 /* window-regeneration routines */ | |
| 5431 /* */ | |
| 5432 /***************************************************************************/ | |
| 5433 | |
| 5434 /* For a given window and starting position in the buffer it contains, | |
| 5435 ensure that the TYPE display lines accurately represent the | |
| 5436 presentation of the window. We pass the buffer instead of getting | |
| 5437 it from the window since redisplay_window may have temporarily | |
| 5438 changed it to the echo area buffer. */ | |
| 5439 | |
| 5440 static void | |
| 2518 | 5441 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, |
| 5442 int type) | |
| 428 | 5443 { |
| 5444 struct frame *f = XFRAME (w->frame); | |
| 5445 struct buffer *b = XBUFFER (w->buffer); | |
| 5446 int ypos = WINDOW_TEXT_TOP (w); | |
| 5447 int yend; /* set farther down */ | |
| 5448 int yclip = WINDOW_TEXT_TOP_CLIP (w); | |
| 442 | 5449 int force; |
| 2518 | 5450 int depth = -1; |
| 428 | 5451 |
| 5452 prop_block_dynarr *prop; | |
| 5453 layout_bounds bounds; | |
| 5454 display_line_dynarr *dla; | |
| 5455 int need_modeline; | |
| 5456 | |
| 5457 /* The lines had better exist by this point. */ | |
| 5458 if (!(dla = window_display_lines (w, type))) | |
| 2500 | 5459 ABORT (); |
| 2518 | 5460 |
| 5461 if (!in_display) | |
| 5462 depth = enter_redisplay_critical_section (); | |
| 5463 | |
| 5038 | 5464 /* This is one spot where a reentrancy crash will occur, due to a check |
| 2518 | 5465 in the dynarr to make sure it isn't "locked" */ |
| 5466 /* | |
| 5467 | |
| 5038 | 5468 Info on reentrancy crashes, with backtraces given: |
| 5469 | |
| 5470 (Info-goto-node "(internals)Critical Redisplay Sections") | |
| 2518 | 5471 */ |
| 5472 | |
| 428 | 5473 Dynarr_reset (dla); |
| 5474 w->max_line_len = 0; | |
| 5475 | |
| 4968 | 5476 /* Added 2-1-10 -- we should never have empty face or glyph cachels |
| 5477 because we initialized them at startup and the only way to reduce | |
| 5478 their number is through calling reset_face_cachels() or | |
| 5479 reset_glyph_cachels(), which as a side effect sets up a number of | |
| 5480 standard entries */ | |
| 5481 assert (Dynarr_length (w->face_cachels)); | |
| 5482 assert (Dynarr_length (w->glyph_cachels)); | |
| 5483 | |
| 5484 #if 0 | |
| 5485 /* #### Delete this code sometime later than 2-1-10 when we're sure it's | |
| 5486 not needed */ | |
| 428 | 5487 /* Normally these get updated in redisplay_window but it is possible |
| 5488 for this function to get called from some other points where that | |
| 5489 update may not have occurred. This acts as a safety check. */ | |
| 5490 if (!Dynarr_length (w->face_cachels)) | |
| 5491 reset_face_cachels (w); | |
| 5492 if (!Dynarr_length (w->glyph_cachels)) | |
| 5493 reset_glyph_cachels (w); | |
| 4968 | 5494 #endif |
| 428 | 5495 |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5496 Fset_marker (w->start[type], make_fixnum (start_pos), w->buffer); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5497 Fset_marker (w->pointm[type], make_fixnum (point), w->buffer); |
| 428 | 5498 w->last_point_x[type] = -1; |
| 5499 w->last_point_y[type] = -1; | |
| 5500 | |
| 5501 /* Make sure a modeline is in the structs if needed. */ | |
| 5502 need_modeline = ensure_modeline_generated (w, type); | |
| 5503 | |
| 5504 /* Wait until here to set this so that the structs have a modeline | |
| 5505 generated in the case where one didn't exist. */ | |
| 5506 yend = WINDOW_TEXT_BOTTOM (w); | |
| 5507 | |
| 5508 bounds = calculate_display_line_boundaries (w, 0); | |
| 5509 | |
| 5510 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */ | |
| 5511 if (MINI_WINDOW_P (w) | |
| 5512 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt)) | |
| 5513 && !echo_area_active (f) | |
| 5514 && start_pos == BUF_BEGV (b)) | |
| 5515 { | |
| 5516 struct prop_block pb; | |
| 5517 Lisp_Object string; | |
| 5518 prop = Dynarr_new (prop_block); | |
| 5519 | |
| 5198 | 5520 string = concat2 (Vminibuf_preprompt, Vminibuf_prompt); |
| 428 | 5521 pb.type = PROP_MINIBUF_PROMPT; |
| 5198 | 5522 pb.data.p_string.str = XSTRING_DATA (string); |
| 5523 pb.data.p_string.len = XSTRING_LENGTH (string); | |
| 428 | 5524 Dynarr_add (prop, pb); |
| 5525 } | |
| 5526 else | |
| 5527 prop = 0; | |
| 5528 | |
| 442 | 5529 /* When we are computing things for scrolling purposes, make |
| 5530 sure at least one line is always generated */ | |
| 5531 force = (type == CMOTION_DISP); | |
| 5532 | |
| 5533 /* Make sure this is set always */ | |
| 5534 /* Note the conversion at end */ | |
| 5535 w->window_end_pos[type] = start_pos; | |
| 5536 while (ypos < yend || force) | |
| 428 | 5537 { |
| 5538 struct display_line dl; | |
| 5539 struct display_line *dlp; | |
| 5540 int local; | |
| 851 | 5541 int pos_of_dlp = -1; |
| 428 | 5542 |
| 5543 if (Dynarr_length (dla) < Dynarr_largest (dla)) | |
| 5544 { | |
| 851 | 5545 pos_of_dlp = Dynarr_length (dla); |
| 5546 dlp = Dynarr_atp (dla, pos_of_dlp); | |
| 428 | 5547 local = 0; |
| 5548 } | |
| 5549 else | |
| 5550 { | |
| 4207 | 5551 DISPLAY_LINE_INIT (dl); |
| 428 | 5552 dlp = &dl; |
| 5553 local = 1; | |
| 5554 } | |
| 5555 | |
| 5556 dlp->bounds = bounds; | |
| 5557 dlp->offset = 0; | |
| 1318 | 5558 Dynarr_lock (dla); |
| 428 | 5559 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type); |
| 1318 | 5560 Dynarr_unlock (dla); |
| 428 | 5561 |
| 5562 if (yclip > dlp->ascent) | |
| 5563 { | |
| 5564 /* this should never happen, but if it does just display the | |
| 5565 whole line */ | |
| 5566 yclip = 0; | |
| 5567 } | |
| 5568 | |
| 5569 dlp->ypos = (ypos + dlp->ascent) - yclip; | |
| 5570 ypos = dlp->ypos + dlp->descent; | |
| 5571 | |
| 5572 /* See if we've been asked to start midway through a line, for | |
| 4187 | 5573 partial display line scrolling. */ |
| 434 | 5574 if (yclip) |
| 428 | 5575 { |
| 5576 dlp->top_clip = yclip; | |
| 5577 yclip = 0; | |
| 5578 } | |
| 5579 else | |
| 5580 dlp->top_clip = 0; | |
| 5581 | |
| 5582 if (ypos > yend) | |
| 5583 { | |
| 5584 int visible_height = dlp->ascent + dlp->descent; | |
| 5585 | |
| 5586 dlp->clip = (ypos - yend); | |
| 5587 /* Although this seems strange we could have a single very | |
| 5588 tall line visible for which we need to account for both | |
| 5589 the top clip and the bottom clip. */ | |
| 5590 visible_height -= (dlp->clip + dlp->top_clip); | |
| 5591 | |
| 442 | 5592 if (visible_height < VERTICAL_CLIP (w, 1) && !force) |
| 428 | 5593 { |
| 5594 if (local) | |
| 5595 free_display_line (dlp); | |
| 5596 break; | |
| 5597 } | |
| 5598 } | |
| 5599 else | |
| 5600 dlp->clip = 0; | |
| 5601 | |
| 5602 if (dlp->cursor_elt != -1) | |
| 5603 { | |
| 5604 /* #### This check is steaming crap. Have to get things | |
| 4187 | 5605 fixed so when create_text_block hits EOB, we're done, |
| 5606 period. */ | |
| 428 | 5607 if (w->last_point_x[type] == -1) |
| 5608 { | |
| 5609 w->last_point_x[type] = dlp->cursor_elt; | |
| 5610 w->last_point_y[type] = Dynarr_length (dla); | |
| 5611 } | |
| 5612 else | |
| 5613 { | |
| 5614 /* #### This means that we've added a cursor at EOB | |
| 4187 | 5615 twice. Yuck oh yuck. */ |
| 1318 | 5616 struct display_block *db; |
| 5617 | |
| 5618 Dynarr_lock (dla); | |
| 5619 db = get_display_block_from_line (dlp, TEXT); | |
| 5620 Dynarr_unlock (dla); | |
| 428 | 5621 |
| 5622 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR; | |
| 5623 dlp->cursor_elt = -1; | |
| 5624 } | |
| 5625 } | |
| 5626 | |
| 5627 if (dlp->num_chars > w->max_line_len) | |
| 5628 w->max_line_len = dlp->num_chars; | |
| 5629 | |
|
4418
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5630 if (pos_of_dlp < 0) |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5631 Dynarr_add (dla, *dlp); |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5632 else if (pos_of_dlp == Dynarr_length (dla)) |
| 5038 | 5633 Dynarr_incrementr (dla); |
|
4418
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5634 else |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5635 ABORT (); |
| 428 | 5636 |
| 5637 /* #### This isn't right, but it is close enough for now. */ | |
| 5638 w->window_end_pos[type] = start_pos; | |
| 5639 | |
| 5640 /* #### This type of check needs to be done down in the | |
| 5641 generate_display_line call. */ | |
| 5642 if (start_pos > BUF_ZV (b)) | |
| 5643 break; | |
| 442 | 5644 |
| 5645 force = 0; | |
| 428 | 5646 } |
| 5647 | |
| 5648 if (prop) | |
| 5649 Dynarr_free (prop); | |
| 5650 | |
| 5651 /* #### More not quite right, but close enough. */ | |
| 442 | 5652 /* Ben sez: apparently window_end_pos[] is measured |
| 428 | 5653 as the number of characters between the window end and the |
| 5654 end of the buffer? This seems rather weirdo. What's | |
| 442 | 5655 the justification for this? |
| 5656 | |
| 5657 JV sez: Because BUF_Z (b) would be a good initial value, however | |
| 5658 that can change. This representation allows initalizing with 0. | |
| 5659 */ | |
| 428 | 5660 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type]; |
| 5661 | |
| 5662 if (need_modeline) | |
| 5663 { | |
| 5664 /* We know that this is the right thing to use because we put it | |
| 4187 | 5665 there when we first started working in this function. */ |
| 4967 | 5666 generate_modeline (w, Dynarr_begin (dla), type); |
| 428 | 5667 } |
| 2518 | 5668 |
| 5669 if (depth >= 0) | |
| 5670 exit_redisplay_critical_section (depth); | |
| 428 | 5671 } |
| 5672 | |
| 826 | 5673 #define REGEN_INC_FIND_START_END \ |
| 5674 do { \ | |
| 5675 /* Determine start and end of lines. */ \ | |
| 5676 if (!Dynarr_length (cdla)) \ | |
| 5677 return 0; \ | |
| 5678 else \ | |
| 5679 { \ | |
| 4967 | 5680 if (Dynarr_begin (cdla)->modeline && Dynarr_begin (ddla)->modeline) \ |
| 826 | 5681 { \ |
| 5682 dla_start = 1; \ | |
| 5683 } \ | |
| 4967 | 5684 else if (!Dynarr_begin (cdla)->modeline \ |
| 5685 && !Dynarr_begin (ddla)->modeline) \ | |
| 826 | 5686 { \ |
| 5687 dla_start = 0; \ | |
| 5688 } \ | |
| 5689 else \ | |
| 2500 | 5690 ABORT (); /* structs differ */ \ |
| 826 | 5691 \ |
| 5692 dla_end = Dynarr_length (cdla) - 1; \ | |
| 5693 } \ | |
| 5694 \ | |
| 5695 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \ | |
| 5696 + Dynarr_atp (cdla, dla_start)->offset); \ | |
| 5697 /* If this isn't true, then startp has changed and we need to do a \ | |
| 5698 full regen. */ \ | |
| 5699 if (startp != start_pos) \ | |
| 5700 return 0; \ | |
| 5701 \ | |
| 5702 /* Point is outside the visible region so give up. */ \ | |
| 5703 if (pointm < start_pos) \ | |
| 5704 return 0; \ | |
| 5705 \ | |
| 428 | 5706 } while (0) |
| 5707 | |
| 5708 /* This attempts to incrementally update the display structures. It | |
| 5709 returns a boolean indicating success or failure. This function is | |
| 5710 very similar to regenerate_window_incrementally and is in fact only | |
| 5711 called from that function. However, because of the nature of the | |
| 5712 changes it deals with it sometimes makes different assumptions | |
| 5713 which can lead to success which are much more difficult to make | |
| 5714 when dealing with buffer changes. */ | |
| 5715 | |
| 5716 static int | |
| 665 | 5717 regenerate_window_extents_only_changed (struct window *w, Charbpos startp, |
| 5718 Charbpos pointm, | |
| 428 | 5719 Charcount beg_unchanged, |
| 5720 Charcount end_unchanged) | |
| 5721 { | |
| 5722 struct buffer *b = XBUFFER (w->buffer); | |
| 5723 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP); | |
| 5724 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP); | |
| 5725 | |
| 5726 int dla_start = 0; | |
| 5727 int dla_end, line; | |
| 5728 int first_line, last_line; | |
| 665 | 5729 Charbpos start_pos; |
| 428 | 5730 /* Don't define this in the loop where it is used because we |
| 5731 definitely want its value to survive between passes. */ | |
| 5732 prop_block_dynarr *prop = NULL; | |
| 5733 | |
| 5734 /* If we don't have any buffer change recorded but the modiff flag has | |
| 5735 been incremented, then fail. I'm not sure of the exact circumstances | |
| 5736 under which this can happen, but I believe that it is probably a | |
| 5737 reasonable happening. */ | |
| 5738 if (!point_visible (w, pointm, CURRENT_DISP) | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5739 || XFIXNUM (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)) |
| 428 | 5740 return 0; |
| 5741 | |
| 5742 /* If the cursor is moved we attempt to update it. If we succeed we | |
| 5743 go ahead and proceed with the optimization attempt. */ | |
| 5744 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer) | |
| 5745 || pointm != marker_position (w->last_point[CURRENT_DISP])) | |
| 5746 { | |
| 5747 struct frame *f = XFRAME (w->frame); | |
| 5748 struct device *d = XDEVICE (f->device); | |
| 5749 struct frame *sel_f = device_selected_frame (d); | |
| 5750 int success = 0; | |
| 5751 | |
| 5752 if (w->last_point_x[CURRENT_DISP] != -1 | |
| 5753 && w->last_point_y[CURRENT_DISP] != -1) | |
| 5754 { | |
| 5755 | |
| 5756 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w))) | |
| 5757 { | |
| 5758 /* Always regenerate the modeline in case it is | |
| 4187 | 5759 displaying the current line or column. */ |
| 428 | 5760 regenerate_modeline (w); |
| 5761 success = 1; | |
| 5762 } | |
| 5763 } | |
| 5764 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f))) | |
| 5765 { | |
| 5766 if (f->modeline_changed) | |
| 5767 regenerate_modeline (w); | |
| 5768 success = 1; | |
| 5769 } | |
| 5770 | |
| 5771 if (!success) | |
| 5772 return 0; | |
| 5773 } | |
| 5774 | |
| 5775 if (beg_unchanged == -1 && end_unchanged == -1) | |
| 5776 return 1; | |
| 5777 | |
| 5778 /* assert: There are no buffer modifications or they are all below the | |
| 5779 visible region. We assume that regenerate_window_incrementally has | |
| 5780 not called us unless this is true. */ | |
| 5781 | |
| 5782 REGEN_INC_FIND_START_END; | |
| 5783 | |
| 5784 /* If the changed are starts before the visible area, give up. */ | |
| 5785 if (beg_unchanged < startp) | |
| 5786 return 0; | |
| 5787 | |
| 5788 /* Find what display line the extent changes first affect. */ | |
| 5789 line = dla_start; | |
| 5790 while (line <= dla_end) | |
| 5791 { | |
| 5792 struct display_line *dl = Dynarr_atp (cdla, line); | |
| 826 | 5793 Charbpos lstart = dl->charpos + dl->offset; |
| 5794 Charbpos lend = dl->end_charpos + dl->offset; | |
| 428 | 5795 |
| 5796 if (beg_unchanged >= lstart && beg_unchanged <= lend) | |
| 5797 break; | |
| 5798 | |
| 5799 line++; | |
| 5800 } | |
| 5801 | |
| 5802 /* If the changes are below the visible area then if point hasn't | |
| 5803 moved return success otherwise fail in order to be safe. */ | |
| 5804 if (line > dla_end) | |
| 5805 { | |
| 5806 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer) | |
| 5807 && pointm == marker_position (w->last_point[CURRENT_DISP])) | |
| 5808 return 1; | |
| 5809 else | |
| 5810 return 0; | |
| 5811 } | |
| 5812 | |
| 5813 /* At this point we know what line the changes first affect. We now | |
| 5814 begin redrawing lines as long as we are still in the affected | |
| 5815 region and the line's size and positioning don't change. | |
| 5816 Otherwise we fail. If we fail we will have altered the desired | |
| 5817 structs which could lead to an assertion failure. However, if we | |
| 5818 fail the next thing that is going to happen is a full regen so we | |
| 5819 will actually end up being safe. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5820 w->last_modified[DESIRED_DISP] = make_fixnum (BUF_MODIFF (b)); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5821 w->last_facechange[DESIRED_DISP] = make_fixnum (BUF_FACECHANGE (b)); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5822 Fset_marker (w->last_start[DESIRED_DISP], make_fixnum (startp), w->buffer); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5823 Fset_marker (w->last_point[DESIRED_DISP], make_fixnum (pointm), w->buffer); |
| 428 | 5824 |
| 5825 first_line = last_line = line; | |
| 5826 while (line <= dla_end) | |
| 5827 { | |
| 2286 | 5828 Charbpos old_start, old_end; |
| 428 | 5829 struct display_line *cdl = Dynarr_atp (cdla, line); |
| 5830 struct display_line *ddl = Dynarr_atp (ddla, line); | |
| 5831 struct display_block *db; | |
| 5832 int initial_size; | |
| 5833 | |
| 826 | 5834 assert (cdl->charpos == ddl->charpos); |
| 5835 assert (cdl->end_charpos == ddl->end_charpos); | |
| 428 | 5836 assert (cdl->offset == ddl->offset); |
| 5837 | |
| 5838 db = get_display_block_from_line (ddl, TEXT); | |
| 5839 initial_size = Dynarr_length (db->runes); | |
| 826 | 5840 old_start = ddl->charpos + ddl->offset; |
| 5841 old_end = ddl->end_charpos + ddl->offset; | |
| 428 | 5842 |
| 5843 /* If this is the first line being updated and it used | |
| 4187 | 5844 propagation data, fail. Otherwise we'll be okay because |
| 5845 we'll have the necessary propagation data. */ | |
| 428 | 5846 if (line == first_line && ddl->used_prop_data) |
| 5847 return 0; | |
| 5848 | |
| 2286 | 5849 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, |
| 5850 &prop, DESIRED_DISP); | |
| 428 | 5851 ddl->offset = 0; |
| 5852 | |
| 5853 /* #### If there is propagated stuff the fail. We could | |
| 4187 | 5854 probably actually deal with this if the line had propagated |
| 5855 information when originally created by a full | |
| 5856 regeneration. */ | |
| 428 | 5857 if (prop) |
| 5858 { | |
| 5859 Dynarr_free (prop); | |
| 5860 return 0; | |
| 5861 } | |
| 5862 | |
| 5863 /* If any line position parameters have changed or a | |
| 4187 | 5864 cursor has disappeared or disappeared, fail. */ |
| 428 | 5865 db = get_display_block_from_line (ddl, TEXT); |
| 5866 if (cdl->ypos != ddl->ypos | |
| 5867 || cdl->ascent != ddl->ascent | |
| 5868 || cdl->descent != ddl->descent | |
| 5869 || cdl->top_clip != ddl->top_clip | |
| 5870 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1) | |
| 5871 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1) | |
| 826 | 5872 || old_start != ddl->charpos |
| 5873 || old_end != ddl->end_charpos | |
| 428 | 5874 || initial_size != Dynarr_length (db->runes)) |
| 5875 { | |
| 5876 return 0; | |
| 5877 } | |
| 5878 | |
| 5879 if (ddl->cursor_elt != -1) | |
| 5880 { | |
| 5881 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt; | |
| 5882 w->last_point_y[DESIRED_DISP] = line; | |
| 5883 } | |
| 5884 | |
| 5885 last_line = line; | |
| 5886 | |
| 5887 /* If the extent changes end on the line we just updated then | |
| 4187 | 5888 we're done. Otherwise go on to the next line. */ |
| 826 | 5889 if (end_unchanged <= ddl->end_charpos) |
| 428 | 5890 break; |
| 5891 else | |
| 5892 line++; | |
| 5893 } | |
| 5894 | |
| 5895 redisplay_update_line (w, first_line, last_line, 1); | |
| 5896 return 1; | |
| 5897 } | |
| 5898 | |
| 5899 /* Attempt to update the display data structures based on knowledge of | |
| 5900 the changed region in the buffer. Returns a boolean indicating | |
| 5901 success or failure. If this function returns a failure then a | |
| 5902 regenerate_window _must_ be performed next in order to maintain | |
| 5903 invariants located here. */ | |
| 5904 | |
| 5905 static int | |
| 665 | 5906 regenerate_window_incrementally (struct window *w, Charbpos startp, |
| 5907 Charbpos pointm) | |
| 428 | 5908 { |
| 5909 struct buffer *b = XBUFFER (w->buffer); | |
| 5910 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP); | |
| 5911 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP); | |
| 5912 Charcount beg_unchanged, end_unchanged; | |
| 5913 Charcount extent_beg_unchanged, extent_end_unchanged; | |
| 5914 | |
| 5915 int dla_start = 0; | |
| 5916 int dla_end, line; | |
| 665 | 5917 Charbpos start_pos; |
| 428 | 5918 |
| 5919 /* If this function is called, the current and desired structures | |
| 5920 had better be identical. If they are not, then that is a bug. */ | |
| 5921 assert (Dynarr_length (cdla) == Dynarr_length (ddla)); | |
| 5922 | |
| 5923 /* We don't handle minibuffer windows yet. The minibuffer prompt | |
| 5924 screws us up. */ | |
| 5925 if (MINI_WINDOW_P (w)) | |
| 5926 return 0; | |
| 5927 | |
| 5928 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b); | |
| 5929 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1 | |
| 5930 ? -1 | |
| 5931 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b)); | |
| 5932 | |
| 5933 /* If nothing has changed in the buffer, then make sure point is ok | |
| 5934 and succeed. */ | |
| 5935 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1) | |
| 5936 return regenerate_window_extents_only_changed (w, startp, pointm, | |
| 5937 extent_beg_unchanged, | |
| 5938 extent_end_unchanged); | |
| 5939 | |
| 5940 /* We can't deal with deleted newlines. */ | |
| 5941 if (BUF_NEWLINE_WAS_DELETED (b)) | |
| 5942 return 0; | |
| 5943 | |
| 5944 beg_unchanged = BUF_BEGIN_UNCHANGED (b); | |
| 5945 end_unchanged = (BUF_END_UNCHANGED (b) == -1 | |
| 5946 ? -1 | |
| 5947 : BUF_Z (b) - BUF_END_UNCHANGED (b)); | |
| 5948 | |
| 5949 REGEN_INC_FIND_START_END; | |
| 5950 | |
| 5951 /* If the changed area starts before the visible area, give up. */ | |
| 5952 if (beg_unchanged < startp) | |
| 5953 return 0; | |
| 5954 | |
| 5955 /* Find what display line the buffer changes first affect. */ | |
| 5956 line = dla_start; | |
| 5957 while (line <= dla_end) | |
| 5958 { | |
| 5959 struct display_line *dl = Dynarr_atp (cdla, line); | |
| 826 | 5960 Charbpos lstart = dl->charpos + dl->offset; |
| 5961 Charbpos lend = dl->end_charpos + dl->offset; | |
| 428 | 5962 |
| 5963 if (beg_unchanged >= lstart && beg_unchanged <= lend) | |
| 5964 break; | |
| 5965 | |
| 5966 line++; | |
| 5967 } | |
| 5968 | |
| 5969 /* If the changes are below the visible area then if point hasn't | |
| 5970 moved return success otherwise fail in order to be safe. */ | |
| 5971 if (line > dla_end) | |
| 5972 return regenerate_window_extents_only_changed (w, startp, pointm, | |
| 5973 extent_beg_unchanged, | |
| 5974 extent_end_unchanged); | |
| 5975 else | |
| 5976 /* At this point we know what line the changes first affect. We | |
| 5977 now redraw that line. If the changes are contained within it | |
| 5978 we are going to succeed and can update just that one line. | |
| 5979 Otherwise we fail. If we fail we will have altered the desired | |
| 5980 structs which could lead to an assertion failure. However, if | |
| 5981 we fail the next thing that is going to happen is a full regen | |
| 5982 so we will actually end up being safe. */ | |
| 5983 { | |
| 5984 prop_block_dynarr *prop = NULL; | |
| 5985 struct display_line *cdl = Dynarr_atp (cdla, line); | |
| 5986 struct display_line *ddl = Dynarr_atp (ddla, line); | |
| 5987 | |
| 826 | 5988 assert (cdl->charpos == ddl->charpos); |
| 5989 assert (cdl->end_charpos == ddl->end_charpos); | |
| 428 | 5990 assert (cdl->offset == ddl->offset); |
| 5991 | |
| 442 | 5992 /* If the line continues to next display line, fail. */ |
| 5993 if (ddl->line_continuation) | |
| 5994 return 0; | |
| 428 | 5995 |
| 5996 /* If the line was generated using propagation data, fail. */ | |
| 5997 if (ddl->used_prop_data) | |
| 5998 return 0; | |
| 5999 | |
| 2286 | 6000 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, |
| 6001 &prop, DESIRED_DISP); | |
| 428 | 6002 ddl->offset = 0; |
| 6003 | |
| 6004 /* If there is propagated stuff then it is pretty much a | |
| 4187 | 6005 guarantee that more than just the one line is affected. */ |
| 428 | 6006 if (prop) |
| 6007 { | |
| 6008 Dynarr_free (prop); | |
| 6009 return 0; | |
| 6010 } | |
| 6011 | |
| 442 | 6012 /* If the line continues to next display line, fail. */ |
| 6013 if (ddl->line_continuation) | |
| 6014 return 0; | |
| 428 | 6015 |
| 6016 /* If any line position parameters have changed or a | |
| 4187 | 6017 cursor has disappeared or disappeared, fail. */ |
| 428 | 6018 if (cdl->ypos != ddl->ypos |
| 6019 || cdl->ascent != ddl->ascent | |
| 6020 || cdl->descent != ddl->descent | |
| 6021 || cdl->top_clip != ddl->top_clip | |
| 6022 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1) | |
| 6023 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)) | |
| 6024 { | |
| 6025 return 0; | |
| 6026 } | |
| 6027 | |
| 6028 /* If the changed area also ends on this line, then we may be in | |
| 4187 | 6029 business. Update everything and return success. */ |
| 826 | 6030 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos) |
| 428 | 6031 { |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6032 w->last_modified[DESIRED_DISP] = make_fixnum (BUF_MODIFF (b)); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6033 w->last_facechange[DESIRED_DISP] = make_fixnum (BUF_FACECHANGE (b)); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6034 Fset_marker (w->last_start[DESIRED_DISP], make_fixnum (startp), |
| 428 | 6035 w->buffer); |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6036 Fset_marker (w->last_point[DESIRED_DISP], make_fixnum (pointm), |
| 428 | 6037 w->buffer); |
| 6038 | |
| 6039 if (ddl->cursor_elt != -1) | |
| 6040 { | |
| 6041 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt; | |
| 6042 w->last_point_y[DESIRED_DISP] = line; | |
| 6043 } | |
| 6044 | |
| 6045 redisplay_update_line (w, line, line, 1); | |
| 6046 regenerate_modeline (w); | |
| 6047 | |
| 6048 /* #### For now we just flush the cache until this has been | |
| 4187 | 6049 tested. After that is done, this should correct the |
| 6050 cache directly. */ | |
| 428 | 6051 Dynarr_reset (w->line_start_cache); |
| 6052 | |
| 6053 /* Adjust the extent changed boundaries to remove any | |
| 4187 | 6054 overlap with the buffer changes since we've just |
| 6055 successfully updated that area. */ | |
| 428 | 6056 if (extent_beg_unchanged != -1 |
| 6057 && extent_beg_unchanged >= beg_unchanged | |
| 6058 && extent_beg_unchanged < end_unchanged) | |
| 6059 extent_beg_unchanged = end_unchanged; | |
| 6060 | |
| 6061 if (extent_end_unchanged != -1 | |
| 6062 && extent_end_unchanged >= beg_unchanged | |
| 6063 && extent_end_unchanged < end_unchanged) | |
| 6064 extent_end_unchanged = beg_unchanged - 1; | |
| 6065 | |
| 6066 if (extent_end_unchanged <= extent_beg_unchanged) | |
| 6067 extent_beg_unchanged = extent_end_unchanged = -1; | |
| 6068 | |
| 6069 /* This could lead to odd results if it fails, but since the | |
| 4187 | 6070 buffer changes update succeeded this probably will to. |
| 6071 We already know that the extent changes start at or after | |
| 6072 the line because we checked before entering the loop. */ | |
| 428 | 6073 if (extent_beg_unchanged != -1 |
| 6074 && extent_end_unchanged != -1 | |
| 826 | 6075 && ((extent_beg_unchanged < ddl->charpos) |
| 6076 || (extent_end_unchanged > ddl->end_charpos))) | |
| 428 | 6077 return regenerate_window_extents_only_changed (w, startp, pointm, |
| 6078 extent_beg_unchanged, | |
| 6079 extent_end_unchanged); | |
| 6080 else | |
| 6081 return 1; | |
| 6082 } | |
| 6083 } | |
| 6084 | |
| 6085 /* Oh, well. */ | |
| 6086 return 0; | |
| 6087 } | |
| 6088 | |
| 6089 /* Given a window and a point, update the given display lines such | |
| 6090 that point is displayed in the middle of the window. | |
| 6091 Return the window's new start position. */ | |
| 6092 | |
| 665 | 6093 static Charbpos |
| 6094 regenerate_window_point_center (struct window *w, Charbpos point, int type) | |
| 428 | 6095 { |
| 665 | 6096 Charbpos startp; |
| 428 | 6097 |
| 6098 /* We need to make sure that the modeline is generated so that the | |
| 6099 window height can be calculated correctly. */ | |
| 6100 ensure_modeline_generated (w, type); | |
| 6101 | |
| 6102 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w)); | |
| 6103 regenerate_window (w, startp, point, type); | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6104 Fset_marker (w->start[type], make_fixnum (startp), w->buffer); |
| 428 | 6105 |
| 6106 return startp; | |
| 6107 } | |
| 6108 | |
| 6109 /* Given a window and a set of display lines, return a boolean | |
| 6110 indicating whether the given point is contained within. */ | |
| 6111 | |
| 6112 static int | |
| 665 | 6113 point_visible (struct window *w, Charbpos point, int type) |
| 428 | 6114 { |
| 6115 struct buffer *b = XBUFFER (w->buffer); | |
| 6116 display_line_dynarr *dla = window_display_lines (w, type); | |
| 6117 int first_line; | |
| 6118 | |
| 4967 | 6119 if (Dynarr_length (dla) && Dynarr_begin (dla)->modeline) |
| 428 | 6120 first_line = 1; |
| 6121 else | |
| 6122 first_line = 0; | |
| 6123 | |
| 6124 if (Dynarr_length (dla) > first_line) | |
| 6125 { | |
| 665 | 6126 Charbpos start, end; |
| 428 | 6127 struct display_line *dl = Dynarr_atp (dla, first_line); |
| 6128 | |
| 826 | 6129 start = dl->charpos; |
| 428 | 6130 end = BUF_Z (b) - w->window_end_pos[type] - 1; |
| 6131 | |
| 6132 if (point >= start && point <= end) | |
| 6133 { | |
| 6134 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines) | |
| 6135 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
6136 dl = Dynarr_lastp (dla); |
| 428 | 6137 |
| 826 | 6138 if (point >= (dl->charpos + dl->offset) |
| 6139 && point <= (dl->end_charpos + dl->offset)) | |
| 428 | 6140 return !dl->clip; |
| 6141 else | |
| 6142 return 1; | |
| 6143 } | |
| 6144 else | |
| 6145 return 1; | |
| 6146 } | |
| 6147 else | |
| 6148 return 0; | |
| 6149 } | |
| 6150 else | |
| 6151 return 0; | |
| 6152 } | |
| 6153 | |
| 6154 /* Return pixel position the middle of the window, not including the | |
| 6155 modeline and any potential horizontal scrollbar. */ | |
| 6156 | |
| 6157 int | |
| 6158 window_half_pixpos (struct window *w) | |
| 6159 { | |
| 6160 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1); | |
| 6161 } | |
| 6162 | |
| 6163 /* Return the display line which is currently in the middle of the | |
| 6164 window W for display lines TYPE. */ | |
| 6165 | |
| 6166 int | |
| 665 | 6167 line_at_center (struct window *w, int type, Charbpos start, Charbpos point) |
| 428 | 6168 { |
| 6169 display_line_dynarr *dla; | |
| 6170 int half; | |
| 6171 int elt; | |
| 6172 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1); | |
| 6173 | |
| 6174 if (type == CMOTION_DISP) | |
| 6175 regenerate_window (w, start, point, type); | |
| 6176 | |
| 6177 dla = window_display_lines (w, type); | |
| 6178 half = window_half_pixpos (w); | |
| 6179 | |
| 6180 for (elt = first_elt; elt < Dynarr_length (dla); elt++) | |
| 6181 { | |
| 6182 struct display_line *dl = Dynarr_atp (dla, elt); | |
| 6183 int line_bot = dl->ypos + dl->descent; | |
| 6184 | |
| 6185 if (line_bot > half) | |
| 6186 return elt; | |
| 6187 } | |
| 6188 | |
| 6189 /* We may not have a line at the middle if the end of the buffer is | |
| 6190 being displayed. */ | |
| 6191 return -1; | |
| 6192 } | |
| 6193 | |
| 6194 /* Return a value for point that would place it at the beginning of | |
| 6195 the line which is in the middle of the window. */ | |
| 6196 | |
| 665 | 6197 Charbpos |
| 6198 point_at_center (struct window *w, int type, Charbpos start, Charbpos point) | |
| 428 | 6199 { |
| 6200 /* line_at_center will regenerate the display structures, if necessary. */ | |
| 6201 int line = line_at_center (w, type, start, point); | |
| 6202 | |
| 6203 if (line == -1) | |
| 6204 return BUF_ZV (XBUFFER (w->buffer)); | |
| 6205 else | |
| 6206 { | |
| 6207 display_line_dynarr *dla = window_display_lines (w, type); | |
| 6208 struct display_line *dl = Dynarr_atp (dla, line); | |
| 6209 | |
| 826 | 6210 return dl->charpos; |
| 428 | 6211 } |
| 6212 } | |
| 6213 | |
| 6214 /* For a given window, ensure that the current visual representation | |
| 6215 is accurate. */ | |
| 6216 | |
| 6217 static void | |
| 6218 redisplay_window (Lisp_Object window, int skip_selected) | |
| 6219 { | |
| 6220 struct window *w = XWINDOW (window); | |
| 6221 struct frame *f = XFRAME (w->frame); | |
| 6222 struct device *d = XDEVICE (f->device); | |
| 6223 Lisp_Object old_buffer = w->buffer; | |
| 6224 Lisp_Object the_buffer = w->buffer; | |
| 6225 struct buffer *b; | |
| 6226 int echo_active = 0; | |
| 6227 int startp = 1; | |
| 6228 int pointm; | |
| 6229 int old_startp = 1; | |
| 6230 int old_pointm = 1; | |
| 6231 int selected_in_its_frame; | |
| 6232 int selected_globally; | |
| 6233 int skip_output = 0; | |
| 6234 int truncation_changed; | |
| 6235 int inactive_minibuffer = | |
| 6236 (MINI_WINDOW_P (w) && | |
| 6237 (f != device_selected_frame (d)) && | |
| 6238 !is_surrogate_for_selected_frame (f)); | |
| 6239 | |
| 6240 /* #### In the new world this function actually does a bunch of | |
| 6241 optimizations such as buffer-based scrolling, but none of that is | |
| 6242 implemented yet. */ | |
| 6243 | |
| 6244 /* If this is a combination window, do its children; that's all. | |
| 6245 The selected window is always a leaf so we don't check for | |
| 6246 skip_selected here. */ | |
| 6247 if (!NILP (w->vchild)) | |
| 6248 { | |
| 6249 redisplay_windows (w->vchild, skip_selected); | |
| 6250 return; | |
| 6251 } | |
| 6252 if (!NILP (w->hchild)) | |
| 6253 { | |
| 6254 redisplay_windows (w->hchild, skip_selected); | |
| 6255 return; | |
| 6256 } | |
| 6257 | |
| 6258 /* Is this window the selected window on its frame? */ | |
| 6259 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f))); | |
| 6260 selected_globally = | |
| 6261 selected_in_its_frame && | |
| 5198 | 6262 EQ (DEVICE_CONSOLE (d), Vselected_console) && |
| 6263 XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d && | |
| 6264 XFRAME (DEVICE_SELECTED_FRAME (d)) == f; | |
| 428 | 6265 if (skip_selected && selected_in_its_frame) |
| 6266 return; | |
| 6267 | |
| 6268 /* It is possible that the window is not fully initialized yet. */ | |
| 6269 if (NILP (w->buffer)) | |
| 6270 return; | |
| 6271 | |
| 6272 if (MINI_WINDOW_P (w) && echo_area_active (f)) | |
| 6273 { | |
| 6274 w->buffer = the_buffer = Vecho_area_buffer; | |
| 6275 echo_active = 1; | |
| 6276 } | |
| 6277 | |
| 6278 b = XBUFFER (w->buffer); | |
| 6279 | |
| 6280 if (echo_active) | |
| 6281 { | |
| 6282 old_pointm = selected_globally | |
| 4187 | 6283 ? BUF_PT (b) |
| 6284 : marker_position (w->pointm[CURRENT_DISP]); | |
| 428 | 6285 pointm = 1; |
| 6286 } | |
| 6287 else | |
| 6288 { | |
| 6289 if (selected_globally) | |
| 6290 { | |
| 6291 pointm = BUF_PT (b); | |
| 6292 } | |
| 6293 else | |
| 6294 { | |
| 6295 pointm = marker_position (w->pointm[CURRENT_DISP]); | |
| 6296 | |
| 6297 if (pointm < BUF_BEGV (b)) | |
| 6298 pointm = BUF_BEGV (b); | |
| 6299 else if (pointm > BUF_ZV (b)) | |
| 6300 pointm = BUF_ZV (b); | |
| 6301 } | |
| 6302 } | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6303 Fset_marker (w->pointm[DESIRED_DISP], make_fixnum (pointm), the_buffer); |
| 428 | 6304 |
| 4968 | 6305 /* Added 2-1-10 -- we should never have empty face or glyph cachels |
| 6306 because we initialized them at startup and the only way to reduce | |
| 6307 their number is through calling reset_face_cachels() or | |
| 6308 reset_glyph_cachels(), which as a side effect sets up a number of | |
|
5587
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6309 standard entries |
|
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6310 2011-10-29 -- We were managing to hit the glyph_cachels assert in certain |
|
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6311 contexts where VM was creating a lot of frames. I don't have a full |
|
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6312 analysis, but I suspect that we were failing to setup the glyph_cachels |
|
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6313 at about l. 961 of frame.c, and a message was being sent to the echo area |
|
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6314 before the initialization was complete. This triggered a redisplay of |
|
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6315 the minibuffer window (this part is confirmed), and thus this assert. */ |
| 4968 | 6316 assert (Dynarr_length (w->face_cachels)); |
| 6317 assert (Dynarr_length (w->glyph_cachels)); | |
| 6318 | |
| 428 | 6319 /* If the buffer has changed we have to invalidate all of our face |
| 6320 cache elements. */ | |
| 6321 if ((!echo_active && b != window_display_buffer (w)) | |
| 6322 || f->faces_changed) | |
| 6323 reset_face_cachels (w); | |
| 6324 else | |
| 6325 mark_face_cachels_as_not_updated (w); | |
| 6326 | |
| 6327 /* Ditto the glyph cache elements, although we do *not* invalidate | |
| 6328 the cache purely because glyphs have changed - this is now | |
| 6329 handled by the dirty flag.*/ | |
| 6330 if ((!echo_active && b != window_display_buffer (w)) | |
| 4968 | 6331 || f->faces_changed) |
| 428 | 6332 reset_glyph_cachels (w); |
| 6333 else | |
| 6334 mark_glyph_cachels_as_not_updated (w); | |
| 6335 | |
| 6336 /* If the marker's buffer is not the window's buffer, then we need | |
| 6337 to find a new starting position. */ | |
| 6338 if (!MINI_WINDOW_P (w) | |
| 6339 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer)) | |
| 6340 { | |
| 6341 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP); | |
| 6342 | |
| 6343 goto regeneration_done; | |
| 6344 } | |
| 6345 | |
| 6346 if (echo_active) | |
| 6347 { | |
| 6348 old_startp = marker_position (w->start[CURRENT_DISP]); | |
| 6349 startp = 1; | |
| 6350 } | |
| 6351 else | |
| 6352 { | |
| 6353 startp = marker_position (w->start[CURRENT_DISP]); | |
| 6354 if (startp < BUF_BEGV (b)) | |
| 6355 startp = BUF_BEGV (b); | |
| 6356 else if (startp > BUF_ZV (b)) | |
| 6357 startp = BUF_ZV (b); | |
| 6358 } | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6359 Fset_marker (w->start[DESIRED_DISP], make_fixnum (startp), the_buffer); |
| 428 | 6360 |
| 6361 truncation_changed = (find_window_mirror (w)->truncate_win != | |
| 647 | 6362 (unsigned int) window_truncation_on (w)); |
| 428 | 6363 |
| 6364 /* If w->force_start is set, then some function set w->start and we | |
| 6365 should display from there and change point, if necessary, to | |
| 6366 ensure that it is visible. */ | |
| 6367 if (w->force_start || inactive_minibuffer) | |
| 6368 { | |
| 6369 w->force_start = 0; | |
| 6370 w->last_modified[DESIRED_DISP] = Qzero; | |
| 6371 w->last_facechange[DESIRED_DISP] = Qzero; | |
| 6372 | |
| 6373 regenerate_window (w, startp, pointm, DESIRED_DISP); | |
| 6374 | |
| 6375 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer) | |
| 6376 { | |
| 6377 pointm = point_at_center (w, DESIRED_DISP, 0, 0); | |
| 6378 | |
| 6379 if (selected_globally) | |
| 6380 BUF_SET_PT (b, pointm); | |
| 6381 | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6382 Fset_marker (w->pointm[DESIRED_DISP], make_fixnum (pointm), |
| 428 | 6383 the_buffer); |
| 6384 | |
| 6385 /* #### BUFU amounts of overkill just to get the cursor | |
| 4187 | 6386 location marked properly. FIX ME FIX ME FIX ME */ |
| 428 | 6387 regenerate_window (w, startp, pointm, DESIRED_DISP); |
| 6388 } | |
| 6389 | |
| 6390 goto regeneration_done; | |
| 6391 } | |
| 6392 | |
| 6393 /* If nothing has changed since the last redisplay, then we just | |
| 6394 need to make sure that point is still visible. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6395 if (XFIXNUM (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6396 && XFIXNUM (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b) |
| 428 | 6397 && pointm >= startp |
| 6398 /* This check is to make sure we restore the minibuffer after a | |
| 4187 | 6399 temporary change to the echo area. */ |
| 428 | 6400 && !(MINI_WINDOW_P (w) && f->buffers_changed) |
| 6401 && !f->frame_changed | |
| 6402 && !truncation_changed | |
| 442 | 6403 /* check whether start is really at the beginning of a line GE */ |
| 428 | 6404 && (!w->start_at_line_beg || beginning_of_line_p (b, startp)) |
| 6405 ) | |
| 6406 { | |
| 6407 /* Check if the cursor has actually moved. */ | |
| 6408 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer) | |
| 6409 && pointm == marker_position (w->last_point[CURRENT_DISP]) | |
| 6410 && selected_globally | |
| 6411 && !w->windows_changed | |
| 6412 && !f->clip_changed | |
| 6413 && !f->extents_changed | |
| 6414 && !f->faces_changed | |
| 6415 && !f->glyphs_changed | |
| 6416 && !f->subwindows_changed | |
| 442 | 6417 /* && !f->subwindows_state_changed*/ |
| 428 | 6418 && !f->point_changed |
| 6419 && !f->windows_structure_changed) | |
| 6420 { | |
| 6421 /* If not, we're done. */ | |
| 6422 if (f->modeline_changed) | |
| 6423 regenerate_modeline (w); | |
| 6424 | |
| 6425 skip_output = 1; | |
| 6426 goto regeneration_done; | |
| 6427 } | |
| 6428 else | |
| 6429 { | |
| 6430 /* If the new point is visible in the redisplay structures, | |
| 4187 | 6431 then let the output update routines handle it, otherwise |
| 6432 do things the hard way. */ | |
| 428 | 6433 if (!w->windows_changed |
| 6434 && !f->clip_changed | |
| 6435 && !f->extents_changed | |
| 6436 && !f->faces_changed | |
| 6437 && !f->glyphs_changed | |
| 6438 && !f->subwindows_changed | |
| 442 | 6439 /* && !f->subwindows_state_changed*/ |
| 428 | 6440 && !f->windows_structure_changed) |
| 6441 { | |
| 6442 if (point_visible (w, pointm, CURRENT_DISP) | |
| 6443 && w->last_point_x[CURRENT_DISP] != -1 | |
| 6444 && w->last_point_y[CURRENT_DISP] != -1) | |
| 6445 { | |
| 6446 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f))) | |
| 6447 { | |
| 6448 /* Always regenerate in case it is displaying | |
| 4187 | 6449 the current line or column. */ |
| 428 | 6450 regenerate_modeline (w); |
| 6451 | |
| 6452 skip_output = 1; | |
| 6453 goto regeneration_done; | |
| 6454 } | |
| 6455 } | |
| 6456 else if (!selected_in_its_frame && !f->point_changed) | |
| 6457 { | |
| 6458 if (f->modeline_changed) | |
| 6459 regenerate_modeline (w); | |
| 6460 | |
| 6461 skip_output = 1; | |
| 6462 goto regeneration_done; | |
| 6463 } | |
| 6464 } | |
| 6465 | |
| 6466 /* If we weren't able to take the shortcut method, then use | |
| 4187 | 6467 the brute force method. */ |
| 428 | 6468 regenerate_window (w, startp, pointm, DESIRED_DISP); |
| 6469 | |
| 6470 if (point_visible (w, pointm, DESIRED_DISP)) | |
| 6471 goto regeneration_done; | |
| 6472 } | |
| 6473 } | |
| 6474 | |
| 6475 /* Check if the starting point is no longer at the beginning of a | |
| 6476 line, in which case find a new starting point. We also recenter | |
| 6477 if our start position is equal to point-max. Otherwise we'll end | |
| 6478 up with a blank window. */ | |
| 6479 else if (((w->start_at_line_beg || MINI_WINDOW_P (w)) | |
| 6480 && !(startp == BUF_BEGV (b) | |
| 6481 || BUF_FETCH_CHAR (b, startp - 1) == '\n')) | |
| 6482 || (pointm == startp && | |
| 6483 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) && | |
| 6484 startp < marker_position (w->last_start[CURRENT_DISP])) | |
| 6485 || (startp == BUF_ZV (b))) | |
| 6486 { | |
| 6487 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP); | |
| 6488 | |
| 6489 goto regeneration_done; | |
| 6490 } | |
| 6491 /* See if we can update the data structures locally based on | |
| 6492 knowledge of what changed in the buffer. */ | |
| 6493 else if (!w->windows_changed | |
| 6494 && !f->clip_changed | |
| 6495 && !f->faces_changed | |
| 6496 && !f->glyphs_changed | |
| 6497 && !f->subwindows_changed | |
| 442 | 6498 /* && !f->subwindows_state_changed*/ |
| 428 | 6499 && !f->windows_structure_changed |
| 6500 && !f->frame_changed | |
| 6501 && !truncation_changed | |
| 6502 && pointm >= startp | |
| 6503 && regenerate_window_incrementally (w, startp, pointm)) | |
| 6504 { | |
| 6505 if (f->modeline_changed | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6506 || XFIXNUM (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6507 || XFIXNUM (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b)) |
| 428 | 6508 regenerate_modeline (w); |
| 6509 | |
| 6510 skip_output = 1; | |
| 6511 goto regeneration_done; | |
| 6512 } | |
| 6513 /* #### This is where a check for structure based scrolling would go. */ | |
| 6514 /* If all else fails, try just regenerating and see what happens. */ | |
| 6515 else | |
| 6516 { | |
| 6517 regenerate_window (w, startp, pointm, DESIRED_DISP); | |
| 6518 | |
| 6519 if (point_visible (w, pointm, DESIRED_DISP)) | |
| 6520 goto regeneration_done; | |
| 6521 } | |
| 6522 | |
| 6523 /* We still haven't gotten the window regenerated with point | |
| 6524 visible. Next we try scrolling a little and see if point comes | |
| 6525 back onto the screen. */ | |
| 6526 if (scroll_step > 0) | |
| 6527 { | |
| 6528 int scrolled = scroll_conservatively; | |
| 6529 for (; scrolled >= 0; scrolled -= scroll_step) | |
| 6530 { | |
| 6531 startp = vmotion (w, startp, | |
| 6532 (pointm < startp) ? -scroll_step : scroll_step, 0); | |
| 6533 regenerate_window (w, startp, pointm, DESIRED_DISP); | |
| 6534 | |
| 6535 if (point_visible (w, pointm, DESIRED_DISP)) | |
| 6536 goto regeneration_done; | |
| 6537 } | |
| 6538 } | |
| 6539 | |
| 6540 /* We still haven't managed to get the screen drawn with point on | |
| 6541 the screen, so just center it and be done with it. */ | |
| 6542 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP); | |
| 6543 | |
| 6544 | |
| 6545 regeneration_done: | |
| 6546 | |
| 6547 /* If the window's frame is changed then reset the current display | |
| 6548 lines in order to force a full repaint. */ | |
| 6549 if (f->frame_changed) | |
| 6550 { | |
| 6551 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP); | |
| 6552 | |
| 6553 Dynarr_reset (cla); | |
| 6554 } | |
| 6555 | |
| 6556 /* Must do this before calling redisplay_output_window because it | |
| 6557 sets some markers on the window. */ | |
| 6558 if (echo_active) | |
| 6559 { | |
| 6560 w->buffer = old_buffer; | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6561 Fset_marker (w->pointm[DESIRED_DISP], make_fixnum (old_pointm), old_buffer); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6562 Fset_marker (w->start[DESIRED_DISP], make_fixnum (old_startp), old_buffer); |
| 428 | 6563 } |
| 6564 | |
| 6565 /* These also have to be set before calling redisplay_output_window | |
| 6566 since it sets the CURRENT_DISP values based on them. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6567 w->last_modified[DESIRED_DISP] = make_fixnum (BUF_MODIFF (b)); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6568 w->last_facechange[DESIRED_DISP] = make_fixnum (BUF_FACECHANGE (b)); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6569 Fset_marker (w->last_start[DESIRED_DISP], make_fixnum (startp), w->buffer); |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6570 Fset_marker (w->last_point[DESIRED_DISP], make_fixnum (pointm), w->buffer); |
| 428 | 6571 |
| 6572 if (!skip_output) | |
| 6573 { | |
| 665 | 6574 Charbpos start = marker_position (w->start[DESIRED_DISP]); |
| 6575 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1 | |
| 428 | 6576 ? BUF_ZV (b) |
| 6577 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1); | |
| 6578 /* Don't pollute the cache if not sure if we are correct */ | |
| 6579 if (w->start_at_line_beg) | |
| 6580 update_line_start_cache (w, start, end, pointm, 1); | |
| 6581 redisplay_output_window (w); | |
| 6582 /* | |
| 6583 * If we just displayed the echo area, the line start cache is | |
| 6584 * no longer valid, because the minibuffer window is associated | |
| 6585 * with the window now. | |
| 6586 */ | |
| 6587 if (echo_active) | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6588 w->line_cache_last_updated = make_fixnum (-1); |
| 428 | 6589 } |
| 6590 | |
| 6591 /* #### This should be dependent on face changes and will need to be | |
| 6592 somewhere else once tty updates occur on a per-frame basis. */ | |
| 6593 mark_face_cachels_as_clean (w); | |
| 6594 | |
| 438 | 6595 /* The glyph cachels only get dirty if someone changed something. |
| 6596 Since redisplay has now effectively ended we can reset the dirty | |
| 6597 flag since everything must be up-to-date. */ | |
| 428 | 6598 if (glyphs_changed) |
| 6599 mark_glyph_cachels_as_clean (w); | |
| 6600 | |
| 6601 w->windows_changed = 0; | |
| 6602 } | |
| 6603 | |
| 6604 /* Call buffer_reset_changes for all buffers present in any window | |
| 6605 currently visible in all frames on all devices. #### There has to | |
| 6606 be a better way to do this. */ | |
| 6607 | |
| 6608 static int | |
| 2286 | 6609 reset_buffer_changes_mapfun (struct window *w, void *UNUSED (closure)) |
| 428 | 6610 { |
| 6611 buffer_reset_changes (XBUFFER (w->buffer)); | |
| 6612 return 0; | |
| 6613 } | |
| 6614 | |
| 6615 static void | |
| 6616 reset_buffer_changes (void) | |
| 6617 { | |
| 6618 Lisp_Object frmcons, devcons, concons; | |
| 6619 | |
| 6620 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) | |
| 6621 { | |
| 6622 struct frame *f = XFRAME (XCAR (frmcons)); | |
| 6623 | |
| 6624 if (FRAME_REPAINT_P (f)) | |
| 6625 map_windows (f, reset_buffer_changes_mapfun, 0); | |
| 6626 } | |
| 6627 } | |
| 6628 | |
| 6629 /* Ensure that all windows underneath the given window in the window | |
| 6630 hierarchy are correctly displayed. */ | |
| 6631 | |
| 6632 static void | |
| 6633 redisplay_windows (Lisp_Object window, int skip_selected) | |
| 6634 { | |
| 6635 for (; !NILP (window) ; window = XWINDOW (window)->next) | |
| 6636 { | |
| 6637 redisplay_window (window, skip_selected); | |
| 6638 } | |
| 6639 } | |
| 6640 | |
| 1318 | 6641 /* Register an action to be called at the end of redisplay. |
| 6642 in_display is 0 when this is called. | |
| 6643 This is used when it is discovered that an action needs to be taken, | |
| 6644 but it's during redisplay, so it's not safe. (Typically, it's an action | |
| 6645 that needs to enter redisplay, which can't happen reentrantly.) | |
| 6646 | |
| 6647 NEVER signal an error in these functions. | |
| 6648 */ | |
| 6649 | |
| 6650 void | |
| 6651 register_post_redisplay_action (void (*fun) (Lisp_Object), Lisp_Object arg) | |
| 6652 { | |
| 6653 Vpost_redisplay_actions = nconc2 (Vpost_redisplay_actions, | |
| 6654 list1 (Fcons (make_opaque_ptr | |
| 6655 ((void *) fun), arg))); | |
| 6656 } | |
| 6657 | |
| 1320 | 6658 static int running_post_redisplay_actions; |
| 6659 | |
| 1318 | 6660 static void |
| 6661 run_post_redisplay_actions (void) | |
| 6662 { | |
| 1320 | 6663 int depth; |
| 6664 | |
| 6665 if (running_post_redisplay_actions) | |
| 6666 return; | |
| 6667 | |
| 6668 depth = internal_bind_int (&running_post_redisplay_actions, 1); | |
| 6669 /* If the function pushes further actions, they will be tacked onto | |
| 6670 the end of the list, and we'll run them when we're done with the | |
| 6671 current ones. */ | |
| 1318 | 6672 while (!NILP (Vpost_redisplay_actions)) |
| 6673 { | |
| 6674 Lisp_Object car = XCAR (Vpost_redisplay_actions); | |
| 6675 void (*fun) (Lisp_Object) = | |
| 6676 (void (*)(Lisp_Object)) get_opaque_ptr (XCAR (car)); | |
| 6677 (*fun) (XCDR (car)); | |
| 6678 free_opaque_ptr (XCAR (car)); | |
| 6679 free_cons (car); | |
| 6680 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions); | |
| 6681 } | |
| 1320 | 6682 unbind_to (depth); |
| 1318 | 6683 } |
| 6684 | |
|
5348
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6685 static int the_ritual_suicide_has_been_cancelled = 0; |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6686 |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6687 void |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6688 redisplay_cancel_ritual_suicide(void) |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6689 { |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6690 the_ritual_suicide_has_been_cancelled = 1; |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6691 } |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6692 |
| 1318 | 6693 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS |
| 6694 | |
| 6695 static Lisp_Object | |
| 2286 | 6696 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe)) |
| 1318 | 6697 { |
|
5348
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6698 if (!the_ritual_suicide_has_been_cancelled) |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6699 { |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6700 assert (!in_display); |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6701 } |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6702 else |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6703 the_ritual_suicide_has_been_cancelled = 0; |
| 1318 | 6704 return Qnil; |
| 6705 } | |
| 6706 | |
| 6707 #endif | |
| 6708 | |
| 6709 /* Within the guts of redisplay, we are defenseless and cannot allow any of | |
| 6710 the following to happen: | |
| 6711 | |
| 6712 1) garbage collection | |
| 6713 2) QUIT | |
| 6714 3) any non-local exits | |
| 6715 4) frame size changes | |
| 6716 5) deletion of any buffers, windows, frames, etc. | |
| 6717 6) modification of buffer text | |
| 6718 7) reentrant entry of redisplay (see the stack trace above | |
| 6719 generate_displayable_area()) | |
| 6720 | |
| 6721 The general reason is that the redisplay code is written to assume that | |
| 6722 it is the only code running, and thus (a) cannot tolerate structures | |
| 6723 changed out from under it (hence 1, 4, 5, 6, 7) and (b) at various points | |
| 6724 within redisplay the redisplay structures may be in an inconsistent | |
| 6725 state and there are no unwind-protects to clean the structures up in | |
| 6726 case of non-local exit (hence 2, 3). Fixing redisplay to address these | |
| 6727 issues is hard and perhaps not worth it (and might slow things down a | |
| 6728 fair amount). We address 1, 4, 5 and 6 ourselves inside of | |
| 6729 enter_redisplay_critical_section() by simply inhibiting them, but we | |
| 6730 cannot handle 2 and 3, which must be handled at the actual point where | |
| 6731 they may occur (especially, internal_equal() or any place that may call | |
| 6732 Lisp), by wrapping the code in call_trapping_problems() or | |
| 6733 call_with_suspended_errors(). [[ NOTE: We could address QUIT by inhibiting | |
| 6734 it but this would be anti-social because it would prevent the user from | |
| 6735 interrupting any Lisp code called within the critical section. With the | |
| 6736 call_*() wrapping, C-g will interrupt the Lisp code and throw back to | |
| 6737 the innermost wrapping. ]] In fact we do turn off QUIT handling, since | |
| 6738 it's just too dangerous otherwise. See below. | |
| 6739 | |
| 6740 Code calling enter_redisplay_critical_section() must check for reentrancy | |
| 6741 (#7) and take appropriate corrective action. | |
| 6742 | |
| 6743 To help debug potential problems, we arrange (when | |
| 6744 ERROR_CHECK_TRAPPING_PROBLEMS is set) to crash automatically every time | |
| 6745 we execute QUIT or call Lisp code unless proper wrapping is in place, as | |
| 6746 well as further checks when we actually Fsignal(), Fthrow(), | |
| 6747 garbage_collect_1(). | |
| 6748 | |
| 6749 #### If a frame-size change does occur we should probably actually be | |
| 6750 preempting redisplay. */ | |
| 6751 | |
| 6752 /* Count of number of recursive times we call | |
| 6753 enter_redisplay_critical_section() or | |
| 6754 enter_redisplay_critical_section_maybe(). | |
| 6755 enter_redisplay_critical_section() cannot occur reentrantly but we have | |
| 6756 to know in the *maybe() version whether to exit the section when we're | |
| 6757 done. */ | |
| 6758 static int in_display_nesting; | |
| 6759 | |
| 6760 static Lisp_Object | |
| 2286 | 6761 end_hold_frame_size_changes (Lisp_Object UNUSED (obj)) |
| 1318 | 6762 { |
| 6763 if (!hold_frame_size_changes) | |
| 6764 { | |
| 6765 /* we used to have a function to do this for only one frame, and | |
| 6766 it was typical to call it at the end of a critical section | |
| 6767 (which occurs once per frame); but what then happens if multiple | |
| 6768 frames have frame changes held up? | |
| 4187 | 6769 |
| 1318 | 6770 This means we are O(N^2) over frames. I seriously doubt it matters. |
| 6771 --ben */ | |
| 6772 Lisp_Object frmcons, devcons, concons; | |
| 4187 | 6773 |
| 1318 | 6774 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) |
| 6775 { | |
| 6776 struct frame *f = XFRAME (XCAR (frmcons)); | |
| 6777 if (f->size_change_pending) | |
| 5043 | 6778 change_frame_size (f, f->new_width, f->new_height, 0); |
| 1318 | 6779 } |
| 6780 } | |
| 6781 return Qnil; | |
| 6782 } | |
| 6783 | |
| 6784 /* Call this to temporarily prevent frame-size changes from being processed. | |
| 6785 To undo, use unbind_to(), passing it the value returned by this function. | |
| 6786 */ | |
| 6787 | |
| 6788 int | |
| 6789 begin_hold_frame_size_changes (void) | |
| 6790 { | |
| 6791 int depth = specpdl_depth (); | |
| 6792 record_unwind_protect (end_hold_frame_size_changes, Qnil); | |
| 6793 internal_bind_int (&hold_frame_size_changes, 1 + hold_frame_size_changes); | |
| 6794 return depth; | |
| 6795 } | |
| 6796 | |
| 6797 int | |
| 6798 enter_redisplay_critical_section (void) | |
| 6799 { | |
| 6800 int depth = specpdl_depth (); | |
| 6801 | |
| 6802 /* Reentrant entry is deadly. The calling function must check for this. */ | |
| 6803 assert (!in_display); | |
| 6804 begin_hold_frame_size_changes (); | |
| 6805 /* Make sure in_display gets reset, but don't set it yet so that | |
| 6806 commit_ritual_suicide() can be used. */ | |
| 6807 internal_bind_int (&in_display, 0); | |
| 6808 internal_bind_int (&in_display_nesting, 1 + in_display_nesting); | |
| 6809 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS | |
| 6810 /* Force every call to QUIT to check for in_displayness. This will | |
| 6811 verify proper wrapping, as in the previous comment, aborting if not. */ | |
| 6812 something_happened++; | |
| 6813 /* Verify that no nonlocal exits blow past us. */ | |
| 6814 record_unwind_protect (commit_ritual_suicide, Qnil); | |
| 6815 #endif | |
| 6816 in_display++; | |
| 6817 | |
| 6818 set_trapping_problems_flags (INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY); | |
| 6819 /* Even checking for QUIT can cause arbitrary Lisp code to be executed, | |
| 6820 e.g. through a menu handler. We really don't want that happening | |
| 6821 inside of redisplay. Code that we `eval' is at least written with the | |
| 6822 expectation that it's inside of redisplay, and shouldn't try anything | |
| 6823 weird; but that's not the case for menu code (e.g. custom loads huge | |
| 6824 amounts of LISP FILES from a menu handler! FMH!). Safest just to turn | |
| 6825 this off. We could turn it on using UNINHIBIT_QUIT or | |
| 6826 begin_do_check_for_quit() in certain places if we want, if we know | |
| 6827 it's not in an especially tricky place. */ | |
| 6828 begin_dont_check_for_quit (); | |
| 6829 return depth; | |
| 6830 } | |
| 6831 | |
| 6832 void | |
| 6833 exit_redisplay_critical_section (int depth) | |
| 6834 { | |
| 6835 in_display--; | |
| 6836 assert (!in_display); | |
| 6837 unbind_to (depth); | |
| 6838 | |
| 6839 run_post_redisplay_actions (); | |
| 6840 } | |
| 6841 | |
| 6842 /* Enter the redisplay critical section if we're not already in it. This | |
| 6843 is for code that needs frame changes held up and other protections from | |
| 6844 being inside, but doesn't modify the redisplay structures, and doesn't | |
| 6845 look at them in a way that they will be confused by inconsistencies. */ | |
| 6846 | |
| 6847 int | |
| 6848 enter_redisplay_critical_section_maybe (void) | |
| 6849 { | |
| 6850 if (!in_display) | |
| 6851 return enter_redisplay_critical_section (); | |
| 6852 else | |
| 6853 return internal_bind_int (&in_display_nesting, 1 + in_display_nesting); | |
| 6854 } | |
| 6855 | |
| 6856 void | |
| 6857 exit_redisplay_critical_section_maybe (int depth) | |
| 6858 { | |
| 6859 if (in_display_nesting == 1) | |
| 6860 exit_redisplay_critical_section (depth); | |
| 6861 else | |
| 6862 unbind_to (depth); | |
| 6863 } | |
| 6864 | |
| 1279 | 6865 /* Ensure that all windows on the given frame are correctly displayed. |
| 6866 Return non-zero if pre-empted. */ | |
| 428 | 6867 |
| 442 | 6868 int |
| 428 | 6869 redisplay_frame (struct frame *f, int preemption_check) |
| 6870 { | |
| 6871 struct device *d = XDEVICE (f->device); | |
| 853 | 6872 int depth; |
| 428 | 6873 |
| 1279 | 6874 assert (f->init_finished); |
| 6875 | |
| 1318 | 6876 /* NOTE: Without sufficient checks for stream frames, we got weird |
| 6877 crashes in pdump. These came and went very easily -- adding the | |
| 6878 critical-section code for redisplay was enough to trigger them. | |
| 6879 Perhaps I should have debugged them but there didn't seem to be any | |
| 6880 point. --ben */ | |
| 1279 | 6881 if (FRAME_STREAM_P (f)) /* nothing to do */ |
| 6882 return 0; | |
| 6883 | |
| 1318 | 6884 /* Reentrancy into redisplay can be deadly. See stack trace above |
| 6885 generate_displayable_area(). */ | |
| 6886 if (in_display) | |
| 6887 return 1; | |
| 6888 | |
| 545 | 6889 if (preemption_check |
| 6890 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY)) | |
| 428 | 6891 { |
| 6892 /* The preemption check itself takes a lot of time, | |
| 6893 so normally don't do it here. We do it if called | |
| 6894 from Lisp, though (`redisplay-frame'). */ | |
| 6895 int preempted; | |
| 6896 | |
| 6897 REDISPLAY_PREEMPTION_CHECK; | |
| 6898 if (preempted) | |
| 6899 return 1; | |
| 6900 } | |
| 6901 | |
| 442 | 6902 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0)) |
| 6903 { | |
| 6904 Lisp_Object frame; | |
| 6905 | |
| 6906 f->old_buffer_alist = Freplace_list (f->old_buffer_alist, | |
| 6907 f->buffer_alist); | |
| 793 | 6908 frame = wrap_frame (f); |
| 442 | 6909 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame); |
| 6910 } | |
| 6911 | |
| 428 | 6912 /* Before we put a hold on frame size changes, attempt to process |
| 6913 any which are already pending. */ | |
| 6914 if (f->size_change_pending) | |
| 5043 | 6915 change_frame_size (f, f->new_width, f->new_height, 0); |
| 428 | 6916 |
| 6917 /* If frame size might need to be changed, due to changed size | |
| 6918 of toolbars, scrollbars etc, change it now */ | |
| 6919 if (f->size_slipped) | |
| 6920 { | |
| 6921 adjust_frame_size (f); | |
| 6922 assert (!f->size_slipped); | |
| 6923 } | |
| 6924 | |
| 1318 | 6925 /* The menubar, toolbar, and icon updates should be done before |
| 853 | 6926 enter_redisplay_critical_section is called and we are officially |
| 3025 | 6927 `in_display'. They is because they tend to eval Lisp code, which |
| 1318 | 6928 needs to be carefully wrapped within the critical section (and hence |
| 6929 is difficult to debug). */ | |
| 428 | 6930 |
| 6931 #ifdef HAVE_MENUBARS | |
| 6932 /* Update the menubar. It is done first since it could change | |
| 6933 the menubar's visibility. This way we avoid having flashing | |
| 6934 caused by an Expose event generated by the visibility change | |
| 6935 being handled. */ | |
| 6936 update_frame_menubars (f); | |
| 6937 #endif /* HAVE_MENUBARS */ | |
| 6938 #ifdef HAVE_TOOLBARS | |
| 905 | 6939 /* Update the toolbars geometry. We don't update the toolbars |
| 6940 themselves at this point since the space they are trying to | |
| 6941 occupy may currently by occupied by gutter elements. Instead we | |
| 6942 update the geometry, then update the gutter geometry, then update | |
| 6943 the gutters - which will cause mapped windows to be repositioned | |
| 6944 - and finally update the toolbars. */ | |
| 6945 update_frame_toolbars_geometry (f); | |
| 428 | 6946 #endif /* HAVE_TOOLBARS */ |
| 442 | 6947 /* Gutter update proper has to be done inside display when no frame |
| 6948 size changes can occur, thus we separately update the gutter | |
| 6949 geometry here if it needs it. */ | |
| 6950 update_frame_gutter_geometry (f); | |
| 428 | 6951 |
| 6952 /* If we clear the frame we have to force its contents to be redrawn. */ | |
| 6953 if (f->clear) | |
| 6954 f->frame_changed = 1; | |
| 6955 | |
| 442 | 6956 /* Invalidate the subwindow caches. We use subwindows_changed here |
| 6957 to cause subwindows to get instantiated. This is because | |
| 428 | 6958 subwindows_state_changed is less strict - dealing with things |
| 6959 like the clicked state of button. We have to do this before | |
| 6960 redisplaying the gutters as subwindows get unmapped in the | |
| 6961 process.*/ | |
| 442 | 6962 if (f->frame_changed) |
| 6963 reset_frame_subwindow_instance_cache (f); | |
| 6964 | |
| 6965 if (f->frame_changed || f->subwindows_changed) | |
| 6966 { | |
| 428 | 6967 /* we have to do this so the gutter gets regenerated. */ |
| 6968 reset_gutter_display_lines (f); | |
| 6969 } | |
| 6970 | |
| 853 | 6971 depth = enter_redisplay_critical_section (); |
| 428 | 6972 |
| 6973 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */ | |
| 1318 | 6974 |
| 6975 /* See comments in enter_redisplay_critical_section() */ | |
| 428 | 6976 |
| 442 | 6977 MAYBE_DEVMETH (d, frame_output_begin, (f)); |
| 6978 | |
| 6979 /* We can now update the gutters, safe in the knowledge that our | |
| 6980 efforts won't get undone. */ | |
| 6981 | |
| 6982 /* This can call lisp, but redisplay is protected by binding | |
| 6983 inhibit_quit. More importantly the code involving display lines | |
| 6984 *assumes* that GC will not happen and so does not GCPRO | |
| 6985 anything. Since we use this code the whole time with the gutters | |
| 1318 | 6986 we cannot allow GC to happen when manipulating the gutters. |
| 6987 | |
| 6988 This must be inside of the critical section for various reasons. | |
| 6989 For example, it messes with display structures, which be left in | |
| 6990 an inconsistent state. */ | |
| 442 | 6991 update_frame_gutters (f); |
| 6992 | |
| 428 | 6993 /* Erase the frame before outputting its contents. */ |
| 6994 if (f->clear) | |
| 6995 { | |
| 442 | 6996 MAYBE_DEVMETH (d, clear_frame, (f)); |
| 428 | 6997 } |
| 6998 | |
| 6999 /* Do the selected window first. */ | |
| 7000 redisplay_window (FRAME_SELECTED_WINDOW (f), 0); | |
| 7001 | |
| 7002 /* Then do the rest. */ | |
| 7003 redisplay_windows (f->root_window, 1); | |
| 7004 | |
| 442 | 7005 MAYBE_DEVMETH (d, frame_output_end, (f)); |
| 428 | 7006 |
| 7007 update_frame_title (f); | |
| 7008 | |
| 905 | 7009 #ifdef HAVE_TOOLBARS |
| 7010 /* Finally update the toolbars. It seems its possible to get in a | |
| 7011 cycle between updating the gutter and the toolbars. Basically we | |
| 7012 want to end up with both being up-to-date and this doesn't seem | |
| 7013 possible in a single pass. */ | |
| 7014 update_frame_toolbars (f); | |
| 7015 #endif /* HAVE_TOOLBARS */ | |
| 7016 | |
| 428 | 7017 CLASS_RESET_CHANGED_FLAGS (f); |
| 7018 f->window_face_cache_reset = 0; | |
| 7019 f->echo_area_garbaged = 0; | |
| 7020 f->clear = 0; | |
| 7021 | |
| 7022 if (!f->size_change_pending) | |
| 7023 f->size_changed = 0; | |
| 7024 | |
| 7025 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */ | |
| 7026 | |
| 853 | 7027 /* Allow frame size changes to occur again. */ |
| 7028 exit_redisplay_critical_section (depth); | |
| 428 | 7029 |
| 7030 return 0; | |
| 7031 } | |
| 7032 | |
| 440 | 7033 /* Ensure that all frames on the given device are correctly displayed. |
| 7034 If AUTOMATIC is non-zero, and the device implementation indicates | |
| 7035 no automatic redisplay, as printers do, then the device is not | |
| 7036 redisplayed. AUTOMATIC is set to zero when called from lisp | |
| 7037 functions (redraw-device) and (redisplay-device), and to non-zero | |
| 7038 when called from "lazy" redisplay(); | |
| 7039 */ | |
| 428 | 7040 |
| 7041 static int | |
| 440 | 7042 redisplay_device (struct device *d, int automatic) |
| 428 | 7043 { |
| 7044 Lisp_Object frame, frmcons; | |
| 7045 int size_change_failed = 0; | |
| 7046 struct frame *f; | |
| 7047 | |
| 545 | 7048 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY)) |
| 440 | 7049 return 0; |
| 7050 | |
| 428 | 7051 if (DEVICE_STREAM_P (d)) /* nothing to do */ |
| 7052 return 0; | |
| 7053 | |
| 7054 /* It is possible that redisplay has been called before the | |
| 545 | 7055 device is fully initialized, or that the console implementation |
| 7056 allows frameless devices. If so then continue with the next | |
| 7057 device. */ | |
| 428 | 7058 if (NILP (DEVICE_SELECTED_FRAME (d))) |
| 7059 return 0; | |
| 7060 | |
| 545 | 7061 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY)) |
| 7062 { | |
| 7063 int preempted; | |
| 7064 REDISPLAY_PREEMPTION_CHECK; | |
| 7065 if (preempted) | |
| 7066 return 1; | |
| 7067 } | |
| 428 | 7068 |
| 7069 /* Always do the selected frame first. */ | |
| 7070 frame = DEVICE_SELECTED_FRAME (d); | |
| 7071 | |
| 7072 f = XFRAME (frame); | |
| 7073 | |
| 7074 if (f->icon_changed || f->windows_changed) | |
| 7075 update_frame_icon (f); | |
| 7076 | |
| 7077 if (FRAME_REPAINT_P (f)) | |
| 7078 { | |
| 5198 | 7079 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f)) |
| 428 | 7080 { |
| 588 | 7081 int preempted = redisplay_frame (f, 1); |
| 545 | 7082 if (preempted) |
| 7083 return 1; | |
| 7084 } | |
| 428 | 7085 |
| 7086 /* If the frame redisplay did not get preempted, then this flag | |
| 4187 | 7087 should have gotten set to 0. It might be possible for that |
| 7088 not to happen if a size change event were to occur at an odd | |
| 7089 time. To make sure we don't miss anything we simply don't | |
| 7090 reset the top level flags until the condition ends up being | |
| 7091 in the right state. */ | |
| 428 | 7092 if (f->size_changed) |
| 7093 size_change_failed = 1; | |
| 7094 } | |
| 7095 | |
| 7096 DEVICE_FRAME_LOOP (frmcons, d) | |
| 7097 { | |
| 7098 f = XFRAME (XCAR (frmcons)); | |
| 7099 | |
| 7100 if (f == XFRAME (DEVICE_SELECTED_FRAME (d))) | |
| 7101 continue; | |
| 7102 | |
| 7103 if (f->icon_changed || f->windows_changed) | |
| 7104 update_frame_icon (f); | |
| 7105 | |
| 7106 if (FRAME_REPAINT_P (f)) | |
| 7107 { | |
| 430 | 7108 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f)) |
| 428 | 7109 { |
| 588 | 7110 int preempted = redisplay_frame (f, 1); |
| 545 | 7111 if (preempted) |
| 7112 return 1; | |
| 428 | 7113 } |
| 7114 | |
| 7115 if (f->size_change_pending) | |
| 7116 size_change_failed = 1; | |
| 7117 } | |
| 7118 } | |
| 7119 | |
| 7120 /* If we get here then we redisplayed all of our frames without | |
| 7121 getting preempted so mark ourselves as clean. */ | |
| 7122 CLASS_RESET_CHANGED_FLAGS (d); | |
| 7123 | |
| 7124 if (!size_change_failed) | |
| 7125 d->size_changed = 0; | |
| 7126 | |
| 7127 return 0; | |
| 7128 } | |
| 7129 | |
| 7130 /* Ensure that all windows on all frames on all devices are displaying | |
| 7131 the current contents of their respective buffers. */ | |
| 7132 | |
| 7133 static void | |
| 7134 redisplay_without_hooks (void) | |
| 7135 { | |
| 7136 Lisp_Object devcons, concons; | |
| 7137 int size_change_failed = 0; | |
| 1292 | 7138 PROFILE_DECLARE (); |
| 7139 | |
| 7140 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay); | |
| 428 | 7141 |
| 7142 if (asynch_device_change_pending) | |
| 7143 handle_asynch_device_change (); | |
| 7144 | |
| 7145 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP && | |
| 430 | 7146 !disable_preemption && preemption_count < max_preempts) |
| 428 | 7147 goto done; |
| 7148 | |
| 7149 DEVICE_LOOP_NO_BREAK (devcons, concons) | |
| 7150 { | |
| 7151 struct device *d = XDEVICE (XCAR (devcons)); | |
| 7152 int preempted; | |
| 7153 | |
| 430 | 7154 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d)) |
| 428 | 7155 { |
| 440 | 7156 preempted = redisplay_device (d, 1); |
| 428 | 7157 |
| 7158 if (preempted) | |
| 7159 { | |
| 7160 preemption_count++; | |
| 7161 RESET_CHANGED_SET_FLAGS; | |
| 7162 goto done; | |
| 7163 } | |
| 7164 | |
| 7165 /* See comment in redisplay_device. */ | |
| 7166 if (d->size_changed) | |
| 7167 size_change_failed = 1; | |
| 7168 } | |
| 7169 } | |
| 7170 preemption_count = 0; | |
| 7171 | |
| 7172 /* Mark redisplay as accurate */ | |
| 7173 GLOBAL_RESET_CHANGED_FLAGS; | |
| 7174 RESET_CHANGED_SET_FLAGS; | |
| 7175 | |
| 7176 if (faces_changed) | |
| 7177 { | |
| 7178 mark_all_faces_as_clean (); | |
| 7179 faces_changed = 0; | |
| 7180 } | |
| 7181 | |
| 7182 if (!size_change_failed) | |
| 7183 size_changed = 0; | |
| 7184 | |
| 7185 reset_buffer_changes (); | |
| 7186 | |
| 7187 done: | |
| 800 | 7188 #ifdef ERROR_CHECK_DISPLAY |
| 7189 sledgehammer_check_redisplay_structs (); | |
| 7190 #endif /* ERROR_CHECK_DISPLAY */ | |
| 1292 | 7191 |
| 7192 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay); | |
| 428 | 7193 } |
| 7194 | |
| 1318 | 7195 /* Note: All places in the C code that call redisplay() are prepared to |
| 7196 handle GCing, which can happen from run_pre_idle_hook(). However, we | |
| 7197 can't currently handle GC inside the guts of redisplay; see | |
| 7198 enter_redisplay_critical_section(). | |
| 853 | 7199 |
| 7200 (#### What about other external entry points to the redisplay code? | |
| 7201 Someone should go through and make sure that all callers can handle | |
| 7202 GC there, too.) | |
| 7203 */ | |
| 7204 | |
| 428 | 7205 void |
| 7206 redisplay (void) | |
| 7207 { | |
| 853 | 7208 run_pre_idle_hook (); |
| 7209 redisplay_no_pre_idle_hook (); | |
| 7210 } | |
| 7211 | |
| 7212 void | |
| 7213 redisplay_no_pre_idle_hook (void) | |
| 7214 { | |
| 428 | 7215 if (last_display_warning_tick != display_warning_tick && |
| 7216 !inhibit_warning_display) | |
| 7217 { | |
| 7218 /* If an error occurs during this function, oh well. | |
| 4187 | 7219 If we report another warning, we could get stuck in an |
| 428 | 7220 infinite loop reporting warnings. */ |
| 853 | 7221 call0_trapping_problems |
| 7222 (0, Qdisplay_warning_buffer, | |
| 7223 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION); | |
| 428 | 7224 last_display_warning_tick = display_warning_tick; |
| 7225 } | |
| 7226 | |
| 7227 redisplay_without_hooks (); | |
| 7228 } | |
| 7229 | |
| 853 | 7230 Lisp_Object |
| 7231 eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker) | |
| 7232 { | |
| 7233 return | |
| 7234 eval_in_buffer_trapping_problems | |
| 7235 ("Error calling function within redisplay", current_buffer, | |
| 1318 | 7236 dont_trust_this_damn_sucker, 0); |
| 853 | 7237 } |
| 428 | 7238 |
| 7239 /* Efficiently determine the window line number, and return a pointer | |
| 7240 to its printed representation. Do this regardless of whether | |
| 7241 line-number-mode is on. The first line in the buffer is counted as | |
| 7242 1. If narrowing is in effect, the lines are counted from the | |
| 7243 beginning of the visible portion of the buffer. */ | |
| 4970 | 7244 static Ascbyte * |
| 428 | 7245 window_line_number (struct window *w, int type) |
| 7246 { | |
| 7247 struct device *d = XDEVICE (XFRAME (w->frame)->device); | |
| 7248 struct buffer *b = XBUFFER (w->buffer); | |
| 7249 /* Be careful in the order of these tests. The first clause will | |
| 7250 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be). | |
| 7251 This can occur when the frame title is computed really early */ | |
| 665 | 7252 Charbpos pos = |
| 5198 | 7253 ((EQ (DEVICE_SELECTED_FRAME (d), w->frame) && |
| 7254 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d)))) && | |
| 7255 EQ (DEVICE_CONSOLE (d), Vselected_console) && | |
| 7256 XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d ) | |
| 428 | 7257 ? BUF_PT (b) |
| 7258 : marker_position (w->pointm[type])); | |
| 7259 EMACS_INT line; | |
| 7260 | |
| 7261 line = buffer_line_number (b, pos, 1); | |
| 7262 | |
| 603 | 7263 { |
| 4970 | 7264 static Ascbyte window_line_number_buf[DECIMAL_PRINT_SIZE (long)]; |
| 603 | 7265 |
| 7266 long_to_string (window_line_number_buf, line + 1); | |
| 7267 | |
| 7268 return window_line_number_buf; | |
| 7269 } | |
| 428 | 7270 } |
| 7271 | |
| 7272 | |
| 7273 /* Given a character representing an object in a modeline | |
| 7274 specification, return a string (stored into the global array | |
| 867 | 7275 `mode_spec_ibyte_string') with the information that object |
| 428 | 7276 represents. |
| 7277 | |
| 7278 This function is largely unchanged from previous versions of the | |
| 7279 redisplay engine. | |
| 7280 | |
| 7281 Warning! This code is also used for frame titles and can be called | |
| 7282 very early in the device/frame update process! JV | |
| 7283 */ | |
| 7284 | |
| 7285 static void | |
| 867 | 7286 decode_mode_spec (struct window *w, Ichar spec, int type) |
| 428 | 7287 { |
| 7288 Lisp_Object obj = Qnil; | |
| 4970 | 7289 const Ascbyte *str = NULL; |
| 428 | 7290 struct buffer *b = XBUFFER (w->buffer); |
| 7291 | |
| 867 | 7292 Dynarr_reset (mode_spec_ibyte_string); |
| 428 | 7293 |
| 7294 switch (spec) | |
| 7295 { | |
| 7296 /* print buffer name */ | |
| 7297 case 'b': | |
| 7298 obj = b->name; | |
| 7299 break; | |
| 7300 | |
| 7301 /* print visited file name */ | |
| 7302 case 'f': | |
| 7303 obj = b->filename; | |
| 7304 break; | |
| 7305 | |
| 7306 /* print the current column */ | |
| 7307 case 'c': | |
| 7308 { | |
| 4187 | 7309 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil))) |
| 7310 ? BUF_PT (b) | |
| 7311 : marker_position (w->pointm[type]); | |
| 428 | 7312 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one; |
| 4970 | 7313 Ascbyte buf[DECIMAL_PRINT_SIZE (long)]; |
| 428 | 7314 |
| 7315 long_to_string (buf, col); | |
| 7316 | |
| 867 | 7317 Dynarr_add_many (mode_spec_ibyte_string, |
| 7318 (const Ibyte *) buf, strlen (buf)); | |
| 428 | 7319 |
| 7320 goto decode_mode_spec_done; | |
| 7321 } | |
| 7322 /* print the file coding system */ | |
| 7323 case 'C': | |
| 7324 { | |
| 4187 | 7325 Lisp_Object codesys = b->buffer_file_coding_system; |
| 7326 /* Be very careful here not to get an error. */ | |
| 428 | 7327 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys)) |
| 4187 | 7328 { |
| 7329 codesys = find_coding_system_for_text_file (codesys, 0); | |
| 428 | 7330 if (CODING_SYSTEMP (codesys)) |
| 4187 | 7331 obj = XCODING_SYSTEM_MNEMONIC (codesys); |
| 7332 } | |
| 428 | 7333 } |
| 7334 break; | |
| 7335 | |
| 7336 /* print the current line number */ | |
| 7337 case 'l': | |
| 7338 str = window_line_number (w, type); | |
| 7339 break; | |
| 7340 | |
| 7341 /* print value of mode-name (obsolete) */ | |
| 7342 case 'm': | |
| 7343 obj = b->mode_name; | |
| 7344 break; | |
| 7345 | |
| 7346 /* print hyphen and frame number, if != 1 */ | |
| 7347 case 'N': | |
| 7348 #ifdef HAVE_TTY | |
| 7349 { | |
| 7350 struct frame *f = XFRAME (w->frame); | |
| 7351 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999) | |
| 7352 { | |
| 7353 /* Naughty, naughty */ | |
| 4970 | 7354 Ascbyte *writable_str = alloca_array (Ascbyte, 10); |
| 428 | 7355 sprintf (writable_str, "-%d", f->order_count); |
| 7356 str = writable_str; | |
| 7357 } | |
| 7358 } | |
| 7359 #endif /* HAVE_TTY */ | |
| 7360 break; | |
| 7361 | |
| 7362 /* print Narrow if appropriate */ | |
| 7363 case 'n': | |
| 7364 if (BUF_BEGV (b) > BUF_BEG (b) | |
| 7365 || BUF_ZV (b) < BUF_Z (b)) | |
| 7366 str = " Narrow"; | |
| 7367 break; | |
| 7368 | |
| 7369 /* print %, * or hyphen, if buffer is read-only, modified or neither */ | |
| 7370 case '*': | |
| 7371 str = (!NILP (b->read_only) | |
| 7372 ? "%" | |
| 7373 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) | |
| 7374 ? "*" | |
| 7375 : "-")); | |
| 7376 break; | |
| 7377 | |
| 7378 /* print * or hyphen -- XEmacs change to allow a buffer to be | |
| 4187 | 7379 read-only but still indicate whether it is modified. */ |
| 428 | 7380 case '+': |
| 7381 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) | |
| 7382 ? "*" | |
| 7383 : (!NILP (b->read_only) | |
| 7384 ? "%" | |
| 7385 : "-")); | |
| 7386 break; | |
| 7387 | |
| 7388 /* #### defined in 19.29 decode_mode_spec, but not in | |
| 4187 | 7389 modeline-format doc string. */ |
| 428 | 7390 /* This differs from %* in that it ignores read-only-ness. */ |
| 7391 case '&': | |
| 7392 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) | |
| 7393 ? "*" | |
| 7394 : "-"); | |
| 7395 break; | |
| 7396 | |
| 7397 /* print process status */ | |
| 7398 case 's': | |
| 7399 obj = Fget_buffer_process (w->buffer); | |
| 7400 if (NILP (obj)) | |
| 7401 str = GETTEXT ("no process"); | |
| 7402 else | |
| 7403 obj = Fsymbol_name (Fprocess_status (obj)); | |
| 7404 break; | |
| 7405 | |
| 7406 /* Print name of selected frame. */ | |
| 7407 case 'S': | |
| 7408 obj = XFRAME (w->frame)->name; | |
| 7409 break; | |
| 7410 | |
| 7411 /* indicate TEXT or BINARY */ | |
| 7412 case 't': | |
| 7413 /* #### NT does not use this any more. Now what? */ | |
| 7414 str = "T"; | |
| 7415 break; | |
| 7416 | |
| 7417 /* print percent of buffer above top of window, or Top, Bot or All */ | |
| 7418 case 'p': | |
| 7419 { | |
| 665 | 7420 Charbpos pos = marker_position (w->start[type]); |
| 428 | 7421 |
| 7422 /* This had better be while the desired lines are being done. */ | |
| 7423 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b)) | |
| 7424 { | |
| 7425 if (pos <= BUF_BEGV (b)) | |
| 7426 str = "All"; | |
| 7427 else | |
| 7428 str = "Bottom"; | |
| 7429 } | |
| 7430 else if (pos <= BUF_BEGV (b)) | |
| 7431 str = "Top"; | |
| 7432 else | |
| 7433 { | |
| 7434 /* This hard limit is ok since the string it will hold has a | |
| 4187 | 7435 fixed maximum length of 3. But just to be safe... */ |
| 4970 | 7436 Ascbyte buf[10]; |
| 428 | 7437 Charcount chars = pos - BUF_BEGV (b); |
| 7438 Charcount total = BUF_ZV (b) - BUF_BEGV (b); | |
| 7439 | |
| 7440 /* Avoid overflow on big buffers */ | |
| 7441 int percent = total > LONG_MAX/200 ? | |
| 7442 (chars + total/200) / (total / 100) : | |
| 7443 (chars * 100 + total/2) / total; | |
| 7444 | |
| 7445 /* We can't normally display a 3-digit number, so get us a | |
| 4187 | 7446 2-digit number that is close. */ |
| 428 | 7447 if (percent == 100) |
| 7448 percent = 99; | |
| 7449 | |
| 7450 sprintf (buf, "%d%%", percent); | |
| 867 | 7451 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf, |
| 428 | 7452 strlen (buf)); |
| 7453 | |
| 7454 goto decode_mode_spec_done; | |
| 7455 } | |
| 7456 break; | |
| 7457 } | |
| 7458 | |
| 7459 /* print percent of buffer above bottom of window, perhaps plus | |
| 7460 Top, or print Bottom or All */ | |
| 7461 case 'P': | |
| 7462 { | |
| 665 | 7463 Charbpos toppos = marker_position (w->start[type]); |
| 7464 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type]; | |
| 428 | 7465 |
| 7466 /* botpos is only accurate as of the last redisplay, so we can | |
| 4187 | 7467 only treat it as a hint. In particular, after erase-buffer, |
| 7468 botpos may be negative. */ | |
| 428 | 7469 if (botpos < toppos) |
| 7470 botpos = toppos; | |
| 7471 | |
| 7472 if (botpos >= BUF_ZV (b)) | |
| 7473 { | |
| 7474 if (toppos <= BUF_BEGV (b)) | |
| 7475 str = "All"; | |
| 7476 else | |
| 7477 str = "Bottom"; | |
| 7478 } | |
| 7479 else | |
| 7480 { | |
| 7481 /* This hard limit is ok since the string it will hold has a | |
| 4187 | 7482 fixed maximum length of around 6. But just to be safe... */ |
| 4970 | 7483 Ascbyte buf[10]; |
| 428 | 7484 Charcount chars = botpos - BUF_BEGV (b); |
| 7485 Charcount total = BUF_ZV (b) - BUF_BEGV (b); | |
| 7486 | |
| 7487 /* Avoid overflow on big buffers */ | |
| 7488 int percent = total > LONG_MAX/200 ? | |
| 7489 (chars + total/200) / (total / 100) : | |
| 7490 (chars * 100 + total/2) / max (total, 1); | |
| 7491 | |
| 7492 /* We can't normally display a 3-digit number, so get us a | |
| 4187 | 7493 2-digit number that is close. */ |
| 428 | 7494 if (percent == 100) |
| 7495 percent = 99; | |
| 7496 | |
| 7497 if (toppos <= BUF_BEGV (b)) | |
| 7498 sprintf (buf, "Top%d%%", percent); | |
| 7499 else | |
| 7500 sprintf (buf, "%d%%", percent); | |
| 7501 | |
| 867 | 7502 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf, |
| 428 | 7503 strlen (buf)); |
| 7504 | |
| 7505 goto decode_mode_spec_done; | |
| 7506 } | |
| 7507 break; | |
| 7508 } | |
| 7509 | |
| 7510 /* print % */ | |
| 7511 case '%': | |
| 7512 str = "%"; | |
| 7513 break; | |
| 7514 | |
| 7515 /* print one [ for each recursive editing level. */ | |
| 7516 case '[': | |
| 7517 { | |
| 7518 int i; | |
| 7519 | |
| 7520 if (command_loop_level > 5) | |
| 7521 { | |
| 7522 str = "[[[... "; | |
| 7523 break; | |
| 7524 } | |
| 7525 | |
| 7526 for (i = 0; i < command_loop_level; i++) | |
| 867 | 7527 Dynarr_add (mode_spec_ibyte_string, '['); |
| 428 | 7528 |
| 7529 goto decode_mode_spec_done; | |
| 7530 } | |
| 7531 | |
| 7532 /* print one ] for each recursive editing level. */ | |
| 7533 case ']': | |
| 7534 { | |
| 7535 int i; | |
| 7536 | |
| 7537 if (command_loop_level > 5) | |
| 7538 { | |
| 7539 str = "...]]]"; | |
| 7540 break; | |
| 7541 } | |
| 7542 | |
| 7543 for (i = 0; i < command_loop_level; i++) | |
| 867 | 7544 Dynarr_add (mode_spec_ibyte_string, ']'); |
| 428 | 7545 |
| 7546 goto decode_mode_spec_done; | |
| 7547 } | |
| 7548 | |
| 7549 /* print infinitely many dashes -- handle at top level now */ | |
| 7550 case '-': | |
| 7551 break; | |
| 7552 | |
| 7553 } | |
| 7554 | |
| 7555 if (STRINGP (obj)) | |
| 867 | 7556 Dynarr_add_many (mode_spec_ibyte_string, |
| 428 | 7557 XSTRING_DATA (obj), |
| 7558 XSTRING_LENGTH (obj)); | |
| 7559 else if (str) | |
| 867 | 7560 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str)); |
| 428 | 7561 |
| 7562 decode_mode_spec_done: | |
| 867 | 7563 Dynarr_add (mode_spec_ibyte_string, '\0'); |
| 428 | 7564 } |
| 7565 | |
| 7566 /* Given a display line, free all of its data structures. */ | |
| 7567 | |
| 7568 static void | |
| 7569 free_display_line (struct display_line *dl) | |
| 7570 { | |
| 7571 int block; | |
| 7572 | |
| 7573 if (dl->display_blocks) | |
| 7574 { | |
| 7575 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++) | |
| 4187 | 7576 { |
| 428 | 7577 struct display_block *db = Dynarr_atp (dl->display_blocks, block); |
| 7578 | |
| 7579 Dynarr_free (db->runes); | |
| 7580 } | |
| 7581 | |
| 7582 Dynarr_free (dl->display_blocks); | |
| 7583 dl->display_blocks = NULL; | |
| 7584 } | |
| 7585 | |
| 7586 if (dl->left_glyphs) | |
| 7587 { | |
| 7588 Dynarr_free (dl->left_glyphs); | |
| 7589 dl->left_glyphs = NULL; | |
| 7590 } | |
| 7591 | |
| 7592 if (dl->right_glyphs) | |
| 7593 { | |
| 7594 Dynarr_free (dl->right_glyphs); | |
| 7595 dl->right_glyphs = NULL; | |
| 7596 } | |
| 7597 } | |
| 7598 | |
| 7599 | |
| 7600 /* Given an array of display lines, free them and all data structures | |
| 7601 contained within them. */ | |
| 7602 | |
| 7603 void | |
| 7604 free_display_lines (display_line_dynarr *dla) | |
| 7605 { | |
| 7606 int line; | |
| 7607 | |
| 7608 for (line = 0; line < Dynarr_largest (dla); line++) | |
| 7609 { | |
| 7610 free_display_line (Dynarr_atp (dla, line)); | |
| 7611 } | |
| 7612 | |
| 7613 Dynarr_free (dla); | |
| 7614 } | |
| 7615 | |
| 7616 /* Call internal free routine for each set of display lines. */ | |
| 7617 | |
| 7618 void | |
| 7619 free_display_structs (struct window_mirror *mir) | |
| 7620 { | |
| 7621 if (mir->current_display_lines) | |
| 7622 { | |
| 7623 free_display_lines (mir->current_display_lines); | |
| 7624 mir->current_display_lines = 0; | |
| 7625 } | |
| 7626 | |
| 7627 if (mir->desired_display_lines) | |
| 7628 { | |
| 7629 free_display_lines (mir->desired_display_lines); | |
| 7630 mir->desired_display_lines = 0; | |
| 7631 } | |
| 7632 } | |
| 7633 | |
| 7634 | |
| 7635 static void | |
| 7636 mark_glyph_block_dynarr (glyph_block_dynarr *gba) | |
| 7637 { | |
| 7638 if (gba) | |
| 7639 { | |
| 4967 | 7640 glyph_block *gb = Dynarr_begin (gba); |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7641 glyph_block *gb_last = Dynarr_past_lastp (gba); |
| 428 | 7642 |
| 7643 for (; gb < gb_last; gb++) | |
| 7644 { | |
| 7645 if (!NILP (gb->glyph)) | |
| 7646 mark_object (gb->glyph); | |
| 7647 if (!NILP (gb->extent)) | |
| 7648 mark_object (gb->extent); | |
| 7649 } | |
| 7650 } | |
| 7651 } | |
| 7652 | |
| 442 | 7653 /* See the comment in image_instantiate_cache_result as to why marking |
| 7654 the glyph will also mark the image_instance. */ | |
| 7655 void | |
| 428 | 7656 mark_redisplay_structs (display_line_dynarr *dla) |
| 7657 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7658 display_line *dl = Dynarr_begin (dla); |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7659 display_line *dl_last = Dynarr_past_lastp (dla); |
| 428 | 7660 |
| 7661 for (; dl < dl_last; dl++) | |
| 7662 { | |
| 7663 display_block_dynarr *dba = dl->display_blocks; | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7664 display_block *db = Dynarr_begin (dba); |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7665 display_block *db_last = Dynarr_past_lastp (dba); |
| 428 | 7666 |
| 7667 for (; db < db_last; db++) | |
| 7668 { | |
| 7669 rune_dynarr *ra = db->runes; | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7670 rune *r = Dynarr_begin (ra); |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7671 rune *r_last = Dynarr_past_lastp (ra); |
| 428 | 7672 |
| 7673 for (; r < r_last; r++) | |
| 7674 { | |
| 7675 if (r->type == RUNE_DGLYPH) | |
| 7676 { | |
| 7677 if (!NILP (r->object.dglyph.glyph)) | |
| 7678 mark_object (r->object.dglyph.glyph); | |
| 7679 if (!NILP (r->object.dglyph.extent)) | |
| 7680 mark_object (r->object.dglyph.extent); | |
| 7681 } | |
| 7682 } | |
| 7683 } | |
| 7684 | |
| 7685 mark_glyph_block_dynarr (dl->left_glyphs); | |
| 7686 mark_glyph_block_dynarr (dl->right_glyphs); | |
| 7687 } | |
| 7688 } | |
| 7689 | |
| 7690 | |
| 2367 | 7691 |
| 7692 /* | |
| 7693 | |
| 7694 Info on line-start cache: | |
| 7695 | |
| 7696 (Info-goto-node "(internals)Line Start Cache") | |
| 7697 */ | |
| 428 | 7698 |
| 7699 /* This will get used quite a bit so we don't want to be constantly | |
| 7700 allocating and freeing it. */ | |
| 7701 static line_start_cache_dynarr *internal_cache; | |
| 7702 | |
| 7703 /* Makes internal_cache represent the TYPE display structs and only | |
| 7704 the TYPE display structs. */ | |
| 7705 | |
| 7706 static void | |
| 7707 update_internal_cache_list (struct window *w, int type) | |
| 7708 { | |
| 7709 int line; | |
| 7710 display_line_dynarr *dla = window_display_lines (w, type); | |
| 7711 | |
| 7712 Dynarr_reset (internal_cache); | |
| 7713 for (line = 0; line < Dynarr_length (dla); line++) | |
| 7714 { | |
| 7715 struct display_line *dl = Dynarr_atp (dla, line); | |
| 7716 | |
| 7717 if (dl->modeline) | |
| 7718 continue; | |
| 7719 else | |
| 7720 { | |
| 7721 struct line_start_cache lsc; | |
| 434 | 7722 |
| 826 | 7723 lsc.start = dl->charpos; |
| 7724 lsc.end = dl->end_charpos; | |
| 428 | 7725 lsc.height = dl->ascent + dl->descent; |
| 7726 | |
| 7727 Dynarr_add (internal_cache, lsc); | |
| 7728 } | |
| 7729 } | |
| 7730 } | |
| 7731 | |
| 7732 /* Reset the line cache if necessary. This should be run at the | |
| 7733 beginning of any function which access the cache. */ | |
| 7734 | |
| 7735 static void | |
| 7736 validate_line_start_cache (struct window *w) | |
| 7737 { | |
| 7738 struct buffer *b = XBUFFER (w->buffer); | |
| 7739 struct frame *f = XFRAME (w->frame); | |
| 7740 | |
| 7741 if (!w->line_cache_validation_override) | |
| 7742 { | |
| 7743 /* f->extents_changed used to be in here because extent face and | |
| 4187 | 7744 size changes can cause text shifting. However, the extent |
| 7745 covering the region is constantly having its face set and | |
| 7746 priority altered by the mouse code. This means that the line | |
| 7747 start cache is constantly being invalidated. This is bad | |
| 7748 since the mouse code also triggers heavy usage of the cache. | |
| 7749 Since it is an unlikely that f->extents being changed | |
| 7750 indicates that the cache really needs to be updated and if it | |
| 7751 does redisplay will catch it pretty quickly we no longer | |
| 7752 invalidate the cache if it is set. This greatly speeds up | |
| 7753 dragging out regions with the mouse. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
7754 if (XFIXNUM (w->line_cache_last_updated) < BUF_MODIFF (b) |
| 428 | 7755 || f->faces_changed |
| 7756 || f->clip_changed) | |
| 7757 { | |
| 7758 Dynarr_reset (w->line_start_cache); | |
| 7759 } | |
| 7760 } | |
| 7761 } | |
| 7762 | |
| 7763 /* Return the very first buffer position contained in the given | |
| 7764 window's cache, or -1 if the cache is empty. Assumes that the | |
| 7765 cache is valid. */ | |
| 7766 | |
| 665 | 7767 static Charbpos |
| 428 | 7768 line_start_cache_start (struct window *w) |
| 7769 { | |
| 7770 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 7771 | |
| 7772 if (!Dynarr_length (cache)) | |
| 7773 return -1; | |
| 7774 else | |
| 4967 | 7775 return Dynarr_begin (cache)->start; |
| 428 | 7776 } |
| 7777 | |
| 7778 /* Return the very last buffer position contained in the given | |
| 7779 window's cache, or -1 if the cache is empty. Assumes that the | |
| 7780 cache is valid. */ | |
| 7781 | |
| 665 | 7782 static Charbpos |
| 428 | 7783 line_start_cache_end (struct window *w) |
| 7784 { | |
| 7785 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 7786 | |
| 7787 if (!Dynarr_length (cache)) | |
| 7788 return -1; | |
| 7789 else | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7790 return Dynarr_lastp (cache)->end; |
| 428 | 7791 } |
| 7792 | |
| 7793 /* Return the index of the line POINT is contained within in window | |
| 7794 W's line start cache. It will enlarge the cache or move the cache | |
| 7795 window in order to have POINT be present in the cache. MIN_PAST is | |
| 7796 a guarantee of the number of entries in the cache present on either | |
| 7797 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1 | |
| 7798 then it will be treated as 0, but the cache window will not be | |
| 7799 allowed to shift. Returns -1 if POINT cannot be found in the cache | |
| 7800 for any reason. */ | |
| 7801 | |
| 7802 int | |
| 665 | 7803 point_in_line_start_cache (struct window *w, Charbpos point, int min_past) |
| 428 | 7804 { |
| 7805 struct buffer *b = XBUFFER (w->buffer); | |
| 7806 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 647 | 7807 int top, bottom, pos; |
| 428 | 7808 |
| 7809 validate_line_start_cache (w); | |
| 7810 w->line_cache_validation_override++; | |
| 7811 | |
| 7812 /* Let functions pass in negative values, but we still treat -1 | |
| 7813 specially. */ | |
| 7814 /* #### bogosity alert */ | |
| 7815 if (min_past < 0 && min_past != -1) | |
| 7816 min_past = -min_past; | |
| 7817 | |
| 7818 if (!Dynarr_length (cache) || line_start_cache_start (w) > point | |
| 7819 || line_start_cache_end (w) < point) | |
| 7820 { | |
| 7821 int loop; | |
| 7822 int win_char_height = window_char_height (w, 1); | |
| 7823 | |
| 7824 /* Occasionally we get here with a 0 height | |
| 4187 | 7825 window. find_next_newline_no_quit will abort if we pass it a |
| 7826 count of 0 so handle that case. */ | |
| 428 | 7827 if (!win_char_height) |
| 7828 win_char_height = 1; | |
| 7829 | |
| 7830 if (!Dynarr_length (cache)) | |
| 7831 { | |
| 665 | 7832 Charbpos from = find_next_newline_no_quit (b, point, -1); |
| 7833 Charbpos to = find_next_newline_no_quit (b, from, win_char_height); | |
| 428 | 7834 |
| 7835 update_line_start_cache (w, from, to, point, 0); | |
| 7836 | |
| 7837 if (!Dynarr_length (cache)) | |
| 7838 { | |
| 7839 w->line_cache_validation_override--; | |
| 7840 return -1; | |
| 7841 } | |
| 7842 } | |
| 7843 | |
| 7844 assert (Dynarr_length (cache)); | |
| 7845 | |
| 7846 loop = 0; | |
| 7847 while (line_start_cache_start (w) > point | |
| 7848 && (loop < cache_adjustment || min_past == -1)) | |
| 7849 { | |
| 665 | 7850 Charbpos from, to; |
| 428 | 7851 |
| 7852 from = line_start_cache_start (w); | |
| 7853 if (from <= BUF_BEGV (b)) | |
| 7854 break; | |
| 7855 | |
| 7856 from = find_next_newline_no_quit (b, from, -win_char_height); | |
| 7857 to = line_start_cache_end (w); | |
| 7858 | |
| 7859 update_line_start_cache (w, from, to, point, 0); | |
| 7860 loop++; | |
| 7861 } | |
| 7862 | |
| 7863 if (line_start_cache_start (w) > point) | |
| 7864 { | |
| 665 | 7865 Charbpos from, to; |
| 428 | 7866 |
| 7867 from = find_next_newline_no_quit (b, point, -1); | |
| 7868 if (from >= BUF_ZV (b)) | |
| 7869 { | |
| 7870 to = find_next_newline_no_quit (b, from, -win_char_height); | |
| 7871 from = to; | |
| 7872 to = BUF_ZV (b); | |
| 7873 } | |
| 7874 else | |
| 7875 to = find_next_newline_no_quit (b, from, win_char_height); | |
| 7876 | |
| 7877 update_line_start_cache (w, from, to, point, 0); | |
| 7878 } | |
| 7879 | |
| 7880 loop = 0; | |
| 7881 while (line_start_cache_end (w) < point | |
| 7882 && (loop < cache_adjustment || min_past == -1)) | |
| 7883 { | |
| 665 | 7884 Charbpos from, to; |
| 428 | 7885 |
| 7886 to = line_start_cache_end (w); | |
| 7887 if (to >= BUF_ZV (b)) | |
| 7888 break; | |
| 7889 | |
| 7890 from = line_start_cache_end (w); | |
| 7891 to = find_next_newline_no_quit (b, from, win_char_height); | |
| 7892 | |
| 7893 update_line_start_cache (w, from, to, point, 0); | |
| 7894 loop++; | |
| 7895 } | |
| 7896 | |
| 7897 if (line_start_cache_end (w) < point) | |
| 7898 { | |
| 665 | 7899 Charbpos from, to; |
| 428 | 7900 |
| 7901 from = find_next_newline_no_quit (b, point, -1); | |
| 7902 if (from >= BUF_ZV (b)) | |
| 7903 { | |
| 7904 to = find_next_newline_no_quit (b, from, -win_char_height); | |
| 7905 from = to; | |
| 7906 to = BUF_ZV (b); | |
| 7907 } | |
| 7908 else | |
| 7909 to = find_next_newline_no_quit (b, from, win_char_height); | |
| 7910 | |
| 7911 update_line_start_cache (w, from, to, point, 0); | |
| 7912 } | |
| 7913 } | |
| 7914 | |
| 7915 assert (Dynarr_length (cache)); | |
| 7916 | |
| 7917 if (min_past == -1) | |
| 7918 min_past = 0; | |
| 7919 | |
| 7920 /* This could happen if the buffer is narrowed. */ | |
| 7921 if (line_start_cache_start (w) > point | |
| 7922 || line_start_cache_end (w) < point) | |
| 7923 { | |
| 7924 w->line_cache_validation_override--; | |
| 7925 return -1; | |
| 7926 } | |
| 7927 | |
| 7928 find_point_loop: | |
| 7929 | |
| 7930 top = Dynarr_length (cache) - 1; | |
| 7931 bottom = 0; | |
| 7932 | |
| 7933 while (1) | |
| 7934 { | |
| 647 | 7935 int new_pos; |
| 665 | 7936 Charbpos start, end; |
| 428 | 7937 |
| 7938 pos = (bottom + top + 1) >> 1; | |
| 7939 start = Dynarr_atp (cache, pos)->start; | |
| 7940 end = Dynarr_atp (cache, pos)->end; | |
| 7941 | |
| 7942 if (point >= start && point <= end) | |
| 7943 { | |
| 7944 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b)) | |
| 7945 { | |
| 665 | 7946 Charbpos from = |
| 428 | 7947 find_next_newline_no_quit (b, line_start_cache_start (w), |
| 7948 -min_past - 1); | |
| 665 | 7949 Charbpos to = line_start_cache_end (w); |
| 428 | 7950 |
| 7951 update_line_start_cache (w, from, to, point, 0); | |
| 7952 goto find_point_loop; | |
| 7953 } | |
| 7954 else if ((Dynarr_length (cache) - pos - 1) < min_past | |
| 7955 && line_start_cache_end (w) < BUF_ZV (b)) | |
| 7956 { | |
| 665 | 7957 Charbpos from = line_start_cache_end (w); |
| 7958 Charbpos to = find_next_newline_no_quit (b, from, | |
| 428 | 7959 (min_past |
| 7960 ? min_past | |
| 7961 : 1)); | |
| 7962 | |
| 7963 update_line_start_cache (w, from, to, point, 0); | |
| 7964 goto find_point_loop; | |
| 7965 } | |
| 7966 else | |
| 7967 { | |
| 7968 w->line_cache_validation_override--; | |
| 7969 return pos; | |
| 7970 } | |
| 7971 } | |
| 7972 else if (point > end) | |
| 7973 bottom = pos + 1; | |
| 7974 else if (point < start) | |
| 7975 top = pos - 1; | |
| 7976 else | |
| 2500 | 7977 ABORT (); |
| 428 | 7978 |
| 7979 new_pos = (bottom + top + 1) >> 1; | |
| 7980 if (pos == new_pos) | |
| 7981 { | |
| 7982 w->line_cache_validation_override--; | |
| 7983 return -1; | |
| 7984 } | |
| 7985 } | |
| 7986 } | |
| 7987 | |
| 7988 /* Return a boolean indicating if POINT would be visible in window W | |
| 1708 | 7989 if display of the window was to begin at STARTP. If PARTIALLY is |
| 7990 zero, then if POINT has fewer visible pixels than the window clip, | |
| 7991 0 is returned; otherwise, 1 is returned if POINT has any visible | |
| 7992 pixels. */ | |
| 428 | 7993 int |
| 1708 | 7994 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point, |
| 7995 int partially) | |
| 428 | 7996 { |
| 7997 struct buffer *b = XBUFFER (w->buffer); | |
| 5198 | 7998 int pixpos = -WINDOW_TEXT_TOP_CLIP (w); |
| 428 | 7999 int bottom = WINDOW_TEXT_HEIGHT (w); |
| 8000 int start_elt; | |
| 8001 | |
| 8002 /* If point is before the intended start it obviously can't be visible. */ | |
| 8003 if (point < startp) | |
| 8004 return 0; | |
| 8005 | |
| 8006 /* If point or start are not in the accessible buffer range, then | |
| 8007 fail. */ | |
| 8008 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b) | |
| 8009 || point < BUF_BEGV (b) || point > BUF_ZV (b)) | |
| 8010 return 0; | |
| 8011 | |
| 8012 validate_line_start_cache (w); | |
| 8013 w->line_cache_validation_override++; | |
| 8014 | |
| 8015 start_elt = point_in_line_start_cache (w, startp, 0); | |
| 8016 if (start_elt == -1) | |
| 8017 { | |
| 8018 w->line_cache_validation_override--; | |
| 8019 return 0; | |
| 8020 } | |
| 8021 | |
| 8022 assert (line_start_cache_start (w) <= startp | |
| 8023 && line_start_cache_end (w) >= startp); | |
| 8024 | |
| 8025 while (1) | |
| 8026 { | |
| 8027 int height; | |
| 8028 | |
| 8029 /* Expand the cache if necessary. */ | |
| 8030 if (start_elt == Dynarr_length (w->line_start_cache)) | |
| 8031 { | |
| 665 | 8032 Charbpos old_startp = |
| 428 | 8033 Dynarr_atp (w->line_start_cache, start_elt - 1)->start; |
| 8034 | |
| 8035 start_elt = point_in_line_start_cache (w, old_startp, | |
| 8036 window_char_height (w, 0)); | |
| 8037 | |
| 8038 /* We've already actually processed old_startp, so increment | |
| 4187 | 8039 immediately. */ |
| 428 | 8040 start_elt++; |
| 8041 | |
| 8042 /* If this happens we didn't add any extra elements. Bummer. */ | |
| 8043 if (start_elt == Dynarr_length (w->line_start_cache)) | |
| 8044 { | |
| 8045 w->line_cache_validation_override--; | |
| 8046 return 0; | |
| 8047 } | |
| 8048 } | |
| 8049 | |
| 8050 height = Dynarr_atp (w->line_start_cache, start_elt)->height; | |
| 8051 | |
| 8052 if (pixpos + height > bottom) | |
| 8053 { | |
| 1708 | 8054 if (bottom - pixpos < (partially ? 0 : VERTICAL_CLIP (w, 0))) |
| 428 | 8055 { |
| 8056 w->line_cache_validation_override--; | |
| 8057 return 0; | |
| 8058 } | |
| 8059 } | |
| 8060 | |
| 8061 pixpos += height; | |
| 8062 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end) | |
| 8063 { | |
| 8064 w->line_cache_validation_override--; | |
| 8065 return 1; | |
| 8066 } | |
| 8067 | |
| 8068 start_elt++; | |
| 8069 } | |
| 8070 } | |
| 8071 | |
| 8072 /* For the given window W, if display starts at STARTP, what will be | |
| 8073 the buffer position at the beginning or end of the last line | |
| 8074 displayed. The end of the last line is also know as the window end | |
| 8075 position. | |
| 8076 | |
| 442 | 8077 WARNING: It is possible that redisplay failed to layout any lines for the |
| 8078 windows. Under normal circumstances this is rare. However it seems that it | |
| 8079 does occur in the following situation: A mouse event has come in and we | |
| 8080 need to compute its location in a window. That code (in | |
| 8081 pixel_to_glyph_translation) already can handle 0 as an error return value. | |
| 8082 | |
| 428 | 8083 #### With a little work this could probably be reworked as just a |
| 8084 call to start_with_line_at_pixpos. */ | |
| 8085 | |
| 665 | 8086 static Charbpos |
| 8087 start_end_of_last_line (struct window *w, Charbpos startp, int end, | |
| 4187 | 8088 int may_error) |
| 428 | 8089 { |
| 8090 struct buffer *b = XBUFFER (w->buffer); | |
| 8091 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 8092 int pixpos = 0; | |
| 8093 int bottom = WINDOW_TEXT_HEIGHT (w); | |
| 665 | 8094 Charbpos cur_start; |
| 428 | 8095 int start_elt; |
| 8096 | |
| 8097 validate_line_start_cache (w); | |
| 8098 w->line_cache_validation_override++; | |
| 8099 | |
| 8100 if (startp < BUF_BEGV (b)) | |
| 8101 startp = BUF_BEGV (b); | |
| 8102 else if (startp > BUF_ZV (b)) | |
| 8103 startp = BUF_ZV (b); | |
| 8104 cur_start = startp; | |
| 8105 | |
| 8106 start_elt = point_in_line_start_cache (w, cur_start, 0); | |
| 8107 if (start_elt == -1) | |
| 442 | 8108 return may_error ? 0 : startp; |
| 428 | 8109 |
| 8110 while (1) | |
| 8111 { | |
| 8112 int height = Dynarr_atp (cache, start_elt)->height; | |
| 8113 | |
| 8114 cur_start = Dynarr_atp (cache, start_elt)->start; | |
| 8115 | |
| 8116 if (pixpos + height > bottom) | |
| 8117 { | |
| 8118 /* Adjust for any possible clip. */ | |
| 8119 if (bottom - pixpos < VERTICAL_CLIP (w, 0)) | |
| 8120 start_elt--; | |
| 8121 | |
| 8122 if (start_elt < 0) | |
| 8123 { | |
| 8124 w->line_cache_validation_override--; | |
| 8125 if (end) | |
| 8126 return BUF_ZV (b); | |
| 8127 else | |
| 8128 return BUF_BEGV (b); | |
| 8129 } | |
| 8130 else | |
| 8131 { | |
| 8132 w->line_cache_validation_override--; | |
| 8133 if (end) | |
| 8134 return Dynarr_atp (cache, start_elt)->end; | |
| 8135 else | |
| 8136 return Dynarr_atp (cache, start_elt)->start; | |
| 8137 } | |
| 8138 } | |
| 8139 | |
| 8140 pixpos += height; | |
| 8141 start_elt++; | |
| 8142 if (start_elt == Dynarr_length (cache)) | |
| 8143 { | |
| 665 | 8144 Charbpos from = line_start_cache_end (w); |
| 428 | 8145 int win_char_height = window_char_height (w, 0); |
| 665 | 8146 Charbpos to = find_next_newline_no_quit (b, from, |
| 428 | 8147 (win_char_height |
| 8148 ? win_char_height | |
| 8149 : 1)); | |
| 8150 | |
| 8151 /* We've hit the end of the bottom so that's what it is. */ | |
| 8152 if (from >= BUF_ZV (b)) | |
| 8153 { | |
| 8154 w->line_cache_validation_override--; | |
| 8155 return BUF_ZV (b); | |
| 8156 } | |
| 8157 | |
| 8158 update_line_start_cache (w, from, to, BUF_PT (b), 0); | |
| 8159 | |
| 8160 /* Updating the cache invalidates any current indexes. */ | |
| 8161 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1; | |
| 8162 } | |
| 8163 } | |
| 8164 } | |
| 8165 | |
| 8166 /* For the given window W, if display starts at STARTP, what will be | |
| 8167 the buffer position at the beginning of the last line displayed. */ | |
| 8168 | |
| 665 | 8169 Charbpos |
| 8170 start_of_last_line (struct window *w, Charbpos startp) | |
| 428 | 8171 { |
| 442 | 8172 return start_end_of_last_line (w, startp, 0 , 0); |
| 428 | 8173 } |
| 8174 | |
| 8175 /* For the given window W, if display starts at STARTP, what will be | |
| 8176 the buffer position at the end of the last line displayed. This is | |
| 8177 also know as the window end position. */ | |
| 8178 | |
| 665 | 8179 Charbpos |
| 8180 end_of_last_line (struct window *w, Charbpos startp) | |
| 428 | 8181 { |
| 442 | 8182 return start_end_of_last_line (w, startp, 1, 0); |
| 428 | 8183 } |
| 8184 | |
| 665 | 8185 static Charbpos |
| 8186 end_of_last_line_may_error (struct window *w, Charbpos startp) | |
| 442 | 8187 { |
| 8188 return start_end_of_last_line (w, startp, 1, 1); | |
| 8189 } | |
| 8190 | |
| 8191 | |
| 428 | 8192 /* For window W, what does the starting position have to be so that |
| 8193 the line containing POINT will cover pixel position PIXPOS. */ | |
| 8194 | |
| 665 | 8195 Charbpos |
| 8196 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos) | |
| 428 | 8197 { |
| 8198 struct buffer *b = XBUFFER (w->buffer); | |
| 8199 int cur_elt; | |
| 665 | 8200 Charbpos cur_pos, prev_pos = point; |
| 428 | 8201 int point_line_height; |
| 8202 int pixheight = pixpos - WINDOW_TEXT_TOP (w); | |
| 8203 | |
| 8204 validate_line_start_cache (w); | |
| 8205 w->line_cache_validation_override++; | |
| 8206 | |
| 8207 cur_elt = point_in_line_start_cache (w, point, 0); | |
| 8208 /* #### See comment in update_line_start_cache about big minibuffers. */ | |
| 8209 if (cur_elt < 0) | |
| 8210 { | |
| 8211 w->line_cache_validation_override--; | |
| 8212 return point; | |
| 8213 } | |
| 8214 | |
| 8215 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height; | |
| 8216 | |
| 8217 while (1) | |
| 8218 { | |
| 8219 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start; | |
| 8220 | |
| 8221 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height; | |
| 8222 | |
| 8223 /* Do not take into account the value of vertical_clip here. | |
| 4187 | 8224 That is the responsibility of the calling functions. */ |
| 428 | 8225 if (pixheight < 0) |
| 8226 { | |
| 8227 w->line_cache_validation_override--; | |
| 8228 if (-pixheight > point_line_height) | |
| 8229 /* We can't make the target line cover pixpos, so put it | |
| 8230 above pixpos. That way it will at least be visible. */ | |
| 8231 return prev_pos; | |
| 8232 else | |
| 8233 return cur_pos; | |
| 8234 } | |
| 8235 | |
| 8236 cur_elt--; | |
| 8237 while (cur_elt < 0) | |
| 8238 { | |
| 665 | 8239 Charbpos from, to; |
| 428 | 8240 int win_char_height; |
| 8241 | |
| 8242 if (cur_pos <= BUF_BEGV (b)) | |
| 8243 { | |
| 8244 w->line_cache_validation_override--; | |
| 8245 return BUF_BEGV (b); | |
| 8246 } | |
| 8247 | |
| 8248 win_char_height = window_char_height (w, 0); | |
| 8249 if (!win_char_height) | |
| 8250 win_char_height = 1; | |
| 8251 | |
| 8252 from = find_next_newline_no_quit (b, cur_pos, -win_char_height); | |
| 8253 to = line_start_cache_end (w); | |
| 8254 update_line_start_cache (w, from, to, point, 0); | |
| 8255 | |
| 8256 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1; | |
| 8257 assert (cur_elt >= -1); | |
| 8258 /* This used to be cur_elt>=0 under the assumption that if | |
| 8259 point is in the top line and not at BUF_BEGV, then | |
| 434 | 8260 setting the window_start to a newline before the start of |
| 428 | 8261 the first line will always cause scrolling. |
| 8262 | |
| 8263 However in my (jv) opinion this is wrong. That new line | |
| 8264 can be hidden in various ways: invisible extents, an | |
| 8265 explicit window-start not at a newline character etc. | |
| 8266 The existence of those are indeed known to create crashes | |
| 8267 on that assert. So we have no option but to continue the | |
| 8268 search if we found point at the top of the line_start_cache | |
| 8269 again. */ | |
| 4967 | 8270 cur_pos = Dynarr_begin (w->line_start_cache)->start; |
| 428 | 8271 } |
| 8272 prev_pos = cur_pos; | |
| 8273 } | |
| 8274 } | |
| 8275 | |
| 8276 /* For window W, what does the starting position have to be so that | |
| 8277 the line containing point is on display line LINE. If LINE is | |
| 8278 positive it is considered to be the number of lines from the top of | |
| 8279 the window (0 is the top line). If it is negative the number is | |
| 8280 considered to be the number of lines from the bottom (-1 is the | |
| 8281 bottom line). */ | |
| 8282 | |
| 665 | 8283 Charbpos |
| 8284 start_with_point_on_display_line (struct window *w, Charbpos point, int line) | |
| 428 | 8285 { |
| 8286 validate_line_start_cache (w); | |
| 8287 w->line_cache_validation_override++; | |
| 8288 | |
| 8289 if (line >= 0) | |
| 8290 { | |
| 8291 int cur_elt = point_in_line_start_cache (w, point, line); | |
| 8292 | |
| 8293 if (cur_elt - line < 0) | |
| 8294 cur_elt = 0; /* Hit the top */ | |
| 8295 else | |
| 8296 cur_elt -= line; | |
| 8297 | |
| 8298 w->line_cache_validation_override--; | |
| 8299 return Dynarr_atp (w->line_start_cache, cur_elt)->start; | |
| 8300 } | |
| 8301 else | |
| 8302 { | |
| 8303 /* The calculated value of pixpos is correct for the bottom line | |
| 4187 | 8304 or what we want when line is -1. Therefore we subtract one |
| 8305 because we have already handled one line. */ | |
| 428 | 8306 int new_line = -line - 1; |
| 8307 int cur_elt = point_in_line_start_cache (w, point, new_line); | |
| 8308 int pixpos = WINDOW_TEXT_BOTTOM (w); | |
| 665 | 8309 Charbpos retval, search_point; |
| 428 | 8310 |
| 8311 /* If scroll_on_clipped_lines is false, the last "visible" line of | |
| 4187 | 8312 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1. |
| 8313 If s_o_c_l is true, then we don't want to count a clipped | |
| 8314 line, so back up from the bottom by the height of the line | |
| 8315 containing point. */ | |
| 428 | 8316 if (scroll_on_clipped_lines) |
| 8317 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height; | |
| 8318 else | |
| 8319 pixpos -= 1; | |
| 8320 | |
| 8321 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache)) | |
| 8322 { | |
| 8323 /* Hit the bottom of the buffer. */ | |
| 8324 int adjustment = | |
| 8325 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1; | |
| 8326 Lisp_Object window; | |
| 8327 int defheight; | |
| 8328 | |
| 793 | 8329 window = wrap_window (w); |
|
5047
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
8330 default_face_width_and_height (window, 0, &defheight); |
| 428 | 8331 |
| 8332 cur_elt = Dynarr_length (w->line_start_cache) - 1; | |
| 8333 | |
| 8334 pixpos -= (adjustment * defheight); | |
| 8335 if (pixpos < WINDOW_TEXT_TOP (w)) | |
| 8336 pixpos = WINDOW_TEXT_TOP (w); | |
| 8337 } | |
| 8338 else | |
| 8339 cur_elt = cur_elt + new_line; | |
| 8340 | |
| 8341 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start; | |
| 8342 | |
| 8343 retval = start_with_line_at_pixpos (w, search_point, pixpos); | |
| 8344 w->line_cache_validation_override--; | |
| 8345 return retval; | |
| 8346 } | |
| 8347 } | |
| 8348 | |
| 8349 /* This is used to speed up vertical scrolling by caching the known | |
| 8350 buffer starting positions for display lines. This allows the | |
| 8351 scrolling routines to avoid costly calls to regenerate_window. If | |
| 8352 NO_REGEN is true then it will only add the values in the DESIRED | |
| 8353 display structs which are in the given range. | |
| 8354 | |
| 8355 Note also that the FROM/TO values are minimums. It is possible | |
| 8356 that this function will actually add information outside of the | |
| 8357 lines containing those positions. This can't hurt but it could | |
| 8358 possibly help. | |
| 8359 | |
| 8360 #### We currently force the cache to have only 1 contiguous region. | |
| 8361 It might help to make the cache a dynarr of caches so that we can | |
| 8362 cover more areas. This might, however, turn out to be a lot of | |
| 8363 overhead for too little gain. */ | |
| 8364 | |
| 8365 static void | |
| 665 | 8366 update_line_start_cache (struct window *w, Charbpos from, Charbpos to, |
| 8367 Charbpos point, int no_regen) | |
| 428 | 8368 { |
| 8369 struct buffer *b = XBUFFER (w->buffer); | |
| 8370 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 665 | 8371 Charbpos low_bound, high_bound; |
| 428 | 8372 |
| 8373 validate_line_start_cache (w); | |
| 8374 w->line_cache_validation_override++; | |
| 8375 | |
| 8376 if (from < BUF_BEGV (b)) | |
| 8377 from = BUF_BEGV (b); | |
| 8378 if (to > BUF_ZV (b)) | |
| 8379 to = BUF_ZV (b); | |
| 8380 | |
| 8381 if (from > to) | |
| 8382 { | |
| 8383 w->line_cache_validation_override--; | |
| 8384 return; | |
| 8385 } | |
| 8386 | |
| 8387 if (Dynarr_length (cache)) | |
| 8388 { | |
| 8389 low_bound = line_start_cache_start (w); | |
| 8390 high_bound = line_start_cache_end (w); | |
| 8391 | |
| 8392 /* Check to see if the desired range is already in the cache. */ | |
| 8393 if (from >= low_bound && to <= high_bound) | |
| 8394 { | |
| 8395 w->line_cache_validation_override--; | |
| 8396 return; | |
| 8397 } | |
| 8398 | |
| 8399 /* Check to make sure that the desired range is adjacent to the | |
| 8400 current cache. If not, invalidate the cache. */ | |
| 8401 if (to < low_bound || from > high_bound) | |
| 8402 { | |
| 8403 Dynarr_reset (cache); | |
| 8404 low_bound = high_bound = -1; | |
| 8405 } | |
| 8406 } | |
| 8407 else | |
| 8408 { | |
| 8409 low_bound = high_bound = -1; | |
| 8410 } | |
| 8411 | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
8412 w->line_cache_last_updated = make_fixnum (BUF_MODIFF (b)); |
| 428 | 8413 |
| 8414 /* This could be integrated into the next two sections, but it is easier | |
| 8415 to follow what's going on by having it separate. */ | |
| 8416 if (no_regen) | |
| 8417 { | |
| 665 | 8418 Charbpos start, end; |
| 428 | 8419 |
| 8420 update_internal_cache_list (w, DESIRED_DISP); | |
| 8421 if (!Dynarr_length (internal_cache)) | |
| 8422 { | |
| 8423 w->line_cache_validation_override--; | |
| 8424 return; | |
| 8425 } | |
| 8426 | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8427 start = Dynarr_begin (internal_cache)->start; |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8428 end = Dynarr_lastp (internal_cache)->end; |
| 428 | 8429 |
| 8430 /* We aren't allowed to generate additional information to fill in | |
| 4187 | 8431 gaps, so if the DESIRED structs don't overlap the cache, reset the |
| 8432 cache. */ | |
| 428 | 8433 if (Dynarr_length (cache)) |
| 8434 { | |
| 8435 if (end < low_bound || start > high_bound) | |
| 8436 Dynarr_reset (cache); | |
| 8437 | |
| 8438 /* #### What should really happen if what we are doing is | |
| 4187 | 8439 extending a line (the last line)? */ |
| 428 | 8440 if (Dynarr_length (cache) == 1 |
| 8441 && Dynarr_length (internal_cache) == 1) | |
| 8442 Dynarr_reset (cache); | |
| 8443 } | |
| 8444 | |
| 8445 if (!Dynarr_length (cache)) | |
| 8446 { | |
| 4967 | 8447 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8448 Dynarr_length (internal_cache)); |
| 8449 w->line_cache_validation_override--; | |
| 8450 return; | |
| 8451 } | |
| 8452 | |
| 8453 /* An extra check just in case the calling function didn't pass in | |
| 4187 | 8454 the bounds of the DESIRED structs in the first place. */ |
| 428 | 8455 if (start >= low_bound && end <= high_bound) |
| 8456 { | |
| 8457 w->line_cache_validation_override--; | |
| 8458 return; | |
| 8459 } | |
| 8460 | |
| 8461 /* At this point we know that the internal cache partially overlaps | |
| 4187 | 8462 the main cache. */ |
| 428 | 8463 if (start < low_bound) |
| 8464 { | |
| 8465 int ic_elt = Dynarr_length (internal_cache) - 1; | |
| 8466 while (ic_elt >= 0) | |
| 8467 { | |
| 8468 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound) | |
| 8469 break; | |
| 8470 else | |
| 8471 ic_elt--; | |
| 8472 } | |
| 8473 | |
| 8474 if (!(ic_elt >= 0)) | |
| 8475 { | |
| 8476 Dynarr_reset (cache); | |
| 4967 | 8477 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8478 Dynarr_length (internal_cache)); |
| 8479 w->line_cache_validation_override--; | |
| 8480 return; | |
| 8481 } | |
| 8482 | |
| 5038 | 8483 Dynarr_prepend_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8484 ic_elt + 1); |
| 8485 } | |
| 8486 | |
| 8487 if (end > high_bound) | |
| 8488 { | |
| 8489 int ic_elt = 0; | |
| 8490 | |
| 8491 while (ic_elt < Dynarr_length (internal_cache)) | |
| 8492 { | |
| 8493 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound) | |
| 8494 break; | |
| 8495 else | |
| 8496 ic_elt++; | |
| 8497 } | |
| 8498 | |
| 8499 if (!(ic_elt < Dynarr_length (internal_cache))) | |
| 8500 { | |
| 8501 Dynarr_reset (cache); | |
| 4967 | 8502 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8503 Dynarr_length (internal_cache)); |
| 8504 w->line_cache_validation_override--; | |
| 8505 return; | |
| 8506 } | |
| 8507 | |
| 8508 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt), | |
| 8509 Dynarr_length (internal_cache) - ic_elt); | |
| 8510 } | |
| 8511 | |
| 8512 w->line_cache_validation_override--; | |
| 8513 return; | |
| 8514 } | |
| 8515 | |
| 8516 if (!Dynarr_length (cache) || from < low_bound) | |
| 8517 { | |
| 665 | 8518 Charbpos startp = find_next_newline_no_quit (b, from, -1); |
| 428 | 8519 int marker = 0; |
| 8520 int old_lb = low_bound; | |
| 8521 | |
| 8522 while (startp < old_lb || low_bound == -1) | |
| 8523 { | |
| 8524 int ic_elt; | |
| 4187 | 8525 Charbpos new_startp; |
| 428 | 8526 |
| 8527 regenerate_window (w, startp, point, CMOTION_DISP); | |
| 8528 update_internal_cache_list (w, CMOTION_DISP); | |
| 8529 | |
| 8530 /* If this assert is triggered then regenerate_window failed | |
| 4187 | 8531 to layout a single line. This is not possible since we |
| 442 | 8532 force at least a single line to be layout for CMOTION_DISP */ |
| 8533 assert (Dynarr_length (internal_cache)); | |
| 4967 | 8534 assert (startp == Dynarr_begin (internal_cache)->start); |
| 428 | 8535 |
| 8536 ic_elt = Dynarr_length (internal_cache) - 1; | |
| 8537 if (low_bound != -1) | |
| 8538 { | |
| 8539 while (ic_elt >= 0) | |
| 8540 { | |
| 8541 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb) | |
| 8542 break; | |
| 8543 else | |
| 8544 ic_elt--; | |
| 8545 } | |
| 8546 } | |
| 8547 assert (ic_elt >= 0); | |
| 8548 | |
| 8549 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1; | |
| 8550 | |
| 4187 | 8551 /* |
| 8552 * Handle invisible text properly: | |
| 8553 * If the last line we're inserting has the same end as the | |
| 8554 * line before which it will be added, merge the two lines. | |
| 8555 */ | |
| 8556 if (Dynarr_length (cache) && | |
| 8557 Dynarr_atp (internal_cache, ic_elt)->end == | |
| 8558 Dynarr_atp (cache, marker)->end) | |
| 8559 { | |
| 8560 Dynarr_atp (cache, marker)->start | |
| 8561 = Dynarr_atp (internal_cache, ic_elt)->start; | |
| 8562 Dynarr_atp (cache, marker)->height | |
| 8563 = Dynarr_atp (internal_cache, ic_elt)->height; | |
| 8564 ic_elt--; | |
| 8565 } | |
| 8566 | |
| 8567 if (ic_elt >= 0) /* we still have lines to add.. */ | |
| 8568 { | |
| 4967 | 8569 Dynarr_insert_many (cache, Dynarr_begin (internal_cache), |
| 4187 | 8570 ic_elt + 1, marker); |
| 8571 marker += (ic_elt + 1); | |
| 8572 } | |
| 428 | 8573 |
| 8574 if (startp < low_bound || low_bound == -1) | |
| 8575 low_bound = startp; | |
| 8576 startp = new_startp; | |
| 8577 if (startp > BUF_ZV (b)) | |
| 8578 { | |
| 8579 w->line_cache_validation_override--; | |
| 8580 return; | |
| 8581 } | |
| 8582 } | |
| 8583 } | |
| 8584 | |
| 8585 assert (Dynarr_length (cache)); | |
| 8586 assert (from >= low_bound); | |
| 8587 | |
| 8588 /* Readjust the high_bound to account for any changes made while | |
| 8589 correcting the low_bound. */ | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8590 high_bound = Dynarr_lastp (cache)->end; |
| 428 | 8591 |
| 8592 if (to > high_bound) | |
| 8593 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8594 Charbpos startp = Dynarr_lastp (cache)->end + 1; |
| 428 | 8595 |
| 8596 do | |
| 8597 { | |
| 8598 regenerate_window (w, startp, point, CMOTION_DISP); | |
| 8599 update_internal_cache_list (w, CMOTION_DISP); | |
| 8600 | |
| 8601 /* See comment above about regenerate_window failing. */ | |
| 8602 assert (Dynarr_length (internal_cache)); | |
| 8603 | |
| 4967 | 8604 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8605 Dynarr_length (internal_cache)); |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8606 high_bound = Dynarr_lastp (cache)->end; |
| 428 | 8607 startp = high_bound + 1; |
| 8608 } | |
| 8609 while (to > high_bound); | |
| 8610 } | |
| 8611 | |
| 8612 w->line_cache_validation_override--; | |
| 8613 assert (to <= high_bound); | |
| 8614 } | |
| 8615 | |
| 8616 | |
| 8617 /* Given x and y coordinates in characters, relative to a window, | |
| 8618 return the pixel location corresponding to those coordinates. The | |
| 8619 pixel location returned is the center of the given character | |
| 8620 position. The pixel values are generated relative to the window, | |
| 8621 not the frame. | |
| 8622 | |
| 8623 The modeline is considered to be part of the window. */ | |
| 8624 | |
| 8625 void | |
| 8626 glyph_to_pixel_translation (struct window *w, int char_x, int char_y, | |
| 8627 int *pix_x, int *pix_y) | |
| 8628 { | |
| 8629 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP); | |
| 8630 int num_disp_lines, modeline; | |
| 8631 Lisp_Object window; | |
| 8632 int defheight, defwidth; | |
| 8633 | |
| 793 | 8634 window = wrap_window (w); |
|
5047
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
8635 default_face_width_and_height (window, &defwidth, &defheight); |
| 428 | 8636 |
| 8637 /* If we get a bogus value indicating somewhere above or to the left of | |
| 8638 the window, use the first window line or character position | |
| 8639 instead. */ | |
| 8640 if (char_y < 0) | |
| 8641 char_y = 0; | |
| 8642 if (char_x < 0) | |
| 8643 char_x = 0; | |
| 8644 | |
| 8645 num_disp_lines = Dynarr_length (dla); | |
| 8646 modeline = 0; | |
| 8647 if (num_disp_lines) | |
| 8648 { | |
| 4967 | 8649 if (Dynarr_begin (dla)->modeline) |
| 428 | 8650 { |
| 8651 num_disp_lines--; | |
| 8652 modeline = 1; | |
| 8653 } | |
| 8654 } | |
| 8655 | |
| 8656 /* First check if the y position intersects the display lines. */ | |
| 8657 if (char_y < num_disp_lines) | |
| 8658 { | |
| 8659 struct display_line *dl = Dynarr_atp (dla, char_y + modeline); | |
| 8660 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 8661 | |
| 8662 *pix_y = (dl->ypos - dl->ascent + | |
| 647 | 8663 ((dl->ascent + dl->descent - dl->clip) >> 1)); |
| 428 | 8664 |
| 8665 if (char_x < Dynarr_length (db->runes)) | |
| 8666 { | |
| 8667 struct rune *rb = Dynarr_atp (db->runes, char_x); | |
| 8668 | |
| 8669 *pix_x = rb->xpos + (rb->width >> 1); | |
| 8670 } | |
| 8671 else | |
| 8672 { | |
| 8673 int last_rune = Dynarr_length (db->runes) - 1; | |
| 8674 struct rune *rb = Dynarr_atp (db->runes, last_rune); | |
| 8675 | |
| 8676 char_x -= last_rune; | |
| 8677 | |
| 8678 *pix_x = rb->xpos + rb->width; | |
| 8679 *pix_x += ((char_x - 1) * defwidth); | |
| 8680 *pix_x += (defwidth >> 1); | |
| 8681 } | |
| 8682 } | |
| 8683 else | |
| 8684 { | |
| 8685 /* It didn't intersect, so extrapolate. #### For now, we include the | |
| 8686 modeline in this since we don't have true character positions in | |
| 8687 it. */ | |
| 8688 | |
| 8689 if (!Dynarr_length (w->face_cachels)) | |
| 8690 reset_face_cachels (w); | |
| 8691 | |
| 8692 char_y -= num_disp_lines; | |
| 8693 | |
| 8694 if (Dynarr_length (dla)) | |
| 8695 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8696 struct display_line *dl = Dynarr_lastp (dla); |
| 428 | 8697 *pix_y = dl->ypos + dl->descent - dl->clip; |
| 8698 } | |
| 8699 else | |
| 8700 *pix_y = WINDOW_TEXT_TOP (w); | |
| 8701 | |
| 8702 *pix_y += (char_y * defheight); | |
| 8703 *pix_y += (defheight >> 1); | |
| 8704 | |
| 8705 *pix_x = WINDOW_TEXT_LEFT (w); | |
| 8706 /* Don't adjust by one because this is still the unadjusted value. */ | |
| 8707 *pix_x += (char_x * defwidth); | |
| 8708 *pix_x += (defwidth >> 1); | |
| 8709 } | |
| 8710 | |
| 8711 if (*pix_x > w->pixel_left + w->pixel_width) | |
| 8712 *pix_x = w->pixel_left + w->pixel_width; | |
| 8713 if (*pix_y > w->pixel_top + w->pixel_height) | |
| 8714 *pix_y = w->pixel_top + w->pixel_height; | |
| 8715 | |
| 8716 *pix_x -= w->pixel_left; | |
| 8717 *pix_y -= w->pixel_top; | |
| 8718 } | |
| 8719 | |
| 8720 /* Given a display line and a position, determine if there is a glyph | |
| 8721 there and return information about it if there is. */ | |
| 8722 | |
| 8723 static void | |
| 8724 get_position_object (struct display_line *dl, Lisp_Object *obj1, | |
| 8725 Lisp_Object *obj2, int x_coord, int *low_x_coord, | |
| 8726 int *high_x_coord) | |
| 8727 { | |
| 8728 struct display_block *db; | |
| 8729 int elt; | |
| 8730 int block = | |
| 8731 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0); | |
| 8732 | |
| 8733 /* We use get_next_display_block to get the actual display block | |
| 8734 that would be displayed at x_coord. */ | |
| 8735 | |
| 8736 if (block == NO_BLOCK) | |
| 8737 return; | |
| 8738 else | |
| 8739 db = Dynarr_atp (dl->display_blocks, block); | |
| 8740 | |
| 8741 for (elt = 0; elt < Dynarr_length (db->runes); elt++) | |
| 8742 { | |
| 8743 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 8744 | |
| 8745 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width)) | |
| 8746 { | |
| 8747 if (rb->type == RUNE_DGLYPH) | |
| 8748 { | |
| 8749 *obj1 = rb->object.dglyph.glyph; | |
| 8750 *obj2 = rb->object.dglyph.extent; | |
| 8751 } | |
| 8752 else | |
| 8753 { | |
| 8754 *obj1 = Qnil; | |
| 8755 *obj2 = Qnil; | |
| 8756 } | |
| 8757 | |
| 8758 if (low_x_coord) | |
| 8759 *low_x_coord = rb->xpos; | |
| 8760 if (high_x_coord) | |
| 8761 *high_x_coord = rb->xpos + rb->width; | |
| 8762 | |
| 8763 return; | |
| 8764 } | |
| 8765 } | |
| 8766 } | |
| 8767 | |
| 8768 #define UPDATE_CACHE_RETURN \ | |
| 8769 do { \ | |
| 8770 d->pixel_to_glyph_cache.valid = 1; \ | |
| 8771 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \ | |
| 8772 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \ | |
| 8773 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \ | |
| 8774 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \ | |
| 8775 d->pixel_to_glyph_cache.frame = f; \ | |
| 8776 d->pixel_to_glyph_cache.col = *col; \ | |
| 8777 d->pixel_to_glyph_cache.row = *row; \ | |
| 8778 d->pixel_to_glyph_cache.obj_x = *obj_x; \ | |
| 8779 d->pixel_to_glyph_cache.obj_y = *obj_y; \ | |
| 8780 d->pixel_to_glyph_cache.w = *w; \ | |
| 5090 | 8781 d->pixel_to_glyph_cache.charpos = *charpos; \ |
| 428 | 8782 d->pixel_to_glyph_cache.closest = *closest; \ |
| 8783 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \ | |
| 8784 d->pixel_to_glyph_cache.obj1 = *obj1; \ | |
| 8785 d->pixel_to_glyph_cache.obj2 = *obj2; \ | |
| 8786 d->pixel_to_glyph_cache.retval = position; \ | |
| 8787 RETURN_SANS_WARNINGS position; \ | |
| 8788 } while (0) | |
| 8789 | |
| 8790 /* Given x and y coordinates in pixels relative to a frame, return | |
| 8791 information about what is located under those coordinates. | |
| 8792 | |
| 8793 The return value will be one of: | |
| 8794 | |
| 8795 OVER_TOOLBAR: over one of the 4 frame toolbars | |
| 8796 OVER_MODELINE: over a modeline | |
| 8797 OVER_BORDER: over an internal border | |
| 5090 | 8798 OVER_V_DIVIDER: over a vertical divider between windows (used as a |
| 8799 grab bar for resizing) | |
| 428 | 8800 OVER_NOTHING: over the text area, but not over text |
| 8801 OVER_OUTSIDE: outside of the frame border | |
| 8802 OVER_TEXT: over text in the text area | |
| 8803 | |
| 5090 | 8804 #### GEOM! We need to also have an OVER_GUTTER, OVER_SCROLLBAR and |
| 8805 OVER_DEAD_BOX. | |
| 8806 | |
| 428 | 8807 OBJ1 is one of |
| 8808 | |
| 8809 -- a toolbar button | |
| 8810 -- a glyph | |
| 8811 -- nil if the coordinates are not over a glyph or a toolbar button. | |
| 8812 | |
| 8813 OBJ2 is one of | |
| 8814 | |
| 8815 -- an extent, if the coordinates are over a glyph in the text area | |
| 8816 -- nil otherwise. | |
| 8817 | |
| 8818 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the | |
| 8819 equivalent coordinates relative to the upper-left corner of the glyph. | |
| 8820 | |
| 8821 If the coordinates are over a character, OBJ_X and OBJ_Y give the | |
| 8822 equivalent coordinates relative to the upper-left corner of the character. | |
| 8823 | |
| 8824 Otherwise, OBJ_X and OBJ_Y are undefined. | |
| 8825 */ | |
| 8826 | |
| 8827 int | |
| 8828 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord, | |
| 8829 int *col, int *row, int *obj_x, int *obj_y, | |
| 826 | 8830 struct window **w, Charbpos *charpos, |
| 665 | 8831 Charbpos *closest, Charcount *modeline_closest, |
| 428 | 8832 Lisp_Object *obj1, Lisp_Object *obj2) |
| 8833 { | |
| 8834 struct device *d; | |
| 8835 struct pixel_to_glyph_translation_cache *cache; | |
| 8836 Lisp_Object window; | |
| 8837 int frm_left, frm_right, frm_top, frm_bottom; | |
| 8838 int low_x_coord, high_x_coord, low_y_coord, high_y_coord; | |
| 8839 int position = OVER_NOTHING; | |
| 8840 int device_check_failed = 0; | |
| 8841 display_line_dynarr *dla; | |
| 8842 | |
| 8843 /* This is a safety valve in case this got called with a frame in | |
| 8844 the middle of being deleted. */ | |
| 8845 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device))) | |
| 8846 { | |
| 8847 device_check_failed = 1; | |
| 8848 d = NULL, cache = NULL; /* Warning suppression */ | |
| 8849 } | |
| 8850 else | |
| 8851 { | |
| 8852 d = XDEVICE (f->device); | |
| 8853 cache = &d->pixel_to_glyph_cache; | |
| 8854 } | |
| 8855 | |
| 8856 if (!device_check_failed | |
| 8857 && cache->valid | |
| 8858 && cache->frame == f | |
| 8859 && cache->low_x_coord <= x_coord | |
| 8860 && cache->high_x_coord > x_coord | |
| 8861 && cache->low_y_coord <= y_coord | |
| 8862 && cache->high_y_coord > y_coord) | |
| 8863 { | |
| 8864 *col = cache->col; | |
| 8865 *row = cache->row; | |
| 8866 *obj_x = cache->obj_x; | |
| 8867 *obj_y = cache->obj_y; | |
| 8868 *w = cache->w; | |
| 826 | 8869 *charpos = cache->charpos; |
| 428 | 8870 *closest = cache->closest; |
| 8871 *modeline_closest = cache->modeline_closest; | |
| 8872 *obj1 = cache->obj1; | |
| 8873 *obj2 = cache->obj2; | |
| 8874 | |
| 8875 return cache->retval; | |
| 8876 } | |
| 8877 else | |
| 8878 { | |
| 8879 *col = 0; | |
| 8880 *row = 0; | |
| 8881 *obj_x = 0; | |
| 8882 *obj_y = 0; | |
| 8883 *w = 0; | |
| 826 | 8884 *charpos = 0; |
| 428 | 8885 *closest = 0; |
| 8886 *modeline_closest = -1; | |
| 8887 *obj1 = Qnil; | |
| 8888 *obj2 = Qnil; | |
| 8889 | |
| 8890 low_x_coord = x_coord; | |
| 8891 high_x_coord = x_coord + 1; | |
| 8892 low_y_coord = y_coord; | |
| 8893 high_y_coord = y_coord + 1; | |
| 8894 } | |
| 8895 | |
| 8896 if (device_check_failed) | |
| 8897 return OVER_NOTHING; | |
| 8898 | |
| 5090 | 8899 /* #### GEOM! The gutter is just inside of this. We should also have an |
| 8900 OVER_GUTTER return value to indicate that we're over a gutter. See | |
| 8901 above. */ | |
| 8902 frm_left = FRAME_LEFT_INTERNAL_BORDER_END (f); | |
| 8903 frm_right = FRAME_RIGHT_INTERNAL_BORDER_START (f); | |
| 8904 frm_top = FRAME_TOP_INTERNAL_BORDER_END (f); | |
| 8905 frm_bottom = FRAME_BOTTOM_INTERNAL_BORDER_START (f); | |
| 428 | 8906 |
| 8907 /* Check if the mouse is outside of the text area actually used by | |
| 8908 redisplay. */ | |
| 8909 if (y_coord < frm_top) | |
| 8910 { | |
| 5090 | 8911 if (y_coord >= FRAME_TOP_INTERNAL_BORDER_START (f)) |
| 8912 { | |
| 8913 low_y_coord = FRAME_TOP_INTERNAL_BORDER_START (f); | |
| 428 | 8914 high_y_coord = frm_top; |
| 8915 position = OVER_BORDER; | |
| 8916 } | |
| 8917 else if (y_coord >= 0) | |
| 8918 { | |
| 8919 low_y_coord = 0; | |
| 5090 | 8920 high_y_coord = FRAME_TOP_INTERNAL_BORDER_START (f); |
| 428 | 8921 position = OVER_TOOLBAR; |
| 8922 } | |
| 8923 else | |
| 8924 { | |
| 8925 low_y_coord = y_coord; | |
| 8926 high_y_coord = 0; | |
| 8927 position = OVER_OUTSIDE; | |
| 8928 } | |
| 8929 } | |
| 8930 else if (y_coord >= frm_bottom) | |
| 8931 { | |
| 5090 | 8932 if (y_coord < FRAME_BOTTOM_INTERNAL_BORDER_END (f)) |
| 428 | 8933 { |
| 8934 low_y_coord = frm_bottom; | |
| 5090 | 8935 high_y_coord = FRAME_BOTTOM_INTERNAL_BORDER_END (f); |
| 428 | 8936 position = OVER_BORDER; |
| 8937 } | |
| 8938 else if (y_coord < FRAME_PIXHEIGHT (f)) | |
| 8939 { | |
| 5090 | 8940 low_y_coord = FRAME_BOTTOM_INTERNAL_BORDER_END (f); |
| 428 | 8941 high_y_coord = FRAME_PIXHEIGHT (f); |
| 8942 position = OVER_TOOLBAR; | |
| 8943 } | |
| 8944 else | |
| 8945 { | |
| 8946 low_y_coord = FRAME_PIXHEIGHT (f); | |
| 8947 high_y_coord = y_coord; | |
| 8948 position = OVER_OUTSIDE; | |
| 8949 } | |
| 8950 } | |
| 8951 | |
| 8952 if (position != OVER_TOOLBAR && position != OVER_BORDER) | |
| 8953 { | |
| 8954 if (x_coord < frm_left) | |
| 8955 { | |
| 5090 | 8956 if (x_coord >= FRAME_LEFT_INTERNAL_BORDER_START (f)) |
| 8957 { | |
| 8958 low_x_coord = FRAME_LEFT_INTERNAL_BORDER_START (f); | |
| 428 | 8959 high_x_coord = frm_left; |
| 8960 position = OVER_BORDER; | |
| 8961 } | |
| 8962 else if (x_coord >= 0) | |
| 8963 { | |
| 8964 low_x_coord = 0; | |
| 5090 | 8965 high_x_coord = FRAME_LEFT_INTERNAL_BORDER_START (f); |
| 428 | 8966 position = OVER_TOOLBAR; |
| 8967 } | |
| 8968 else | |
| 8969 { | |
| 8970 low_x_coord = x_coord; | |
| 8971 high_x_coord = 0; | |
| 8972 position = OVER_OUTSIDE; | |
| 8973 } | |
| 8974 } | |
| 8975 else if (x_coord >= frm_right) | |
| 8976 { | |
| 5090 | 8977 if (x_coord < FRAME_RIGHT_INTERNAL_BORDER_END (f)) |
| 428 | 8978 { |
| 8979 low_x_coord = frm_right; | |
| 5090 | 8980 high_x_coord = FRAME_RIGHT_INTERNAL_BORDER_END (f); |
| 428 | 8981 position = OVER_BORDER; |
| 8982 } | |
| 8983 else if (x_coord < FRAME_PIXWIDTH (f)) | |
| 8984 { | |
| 5090 | 8985 low_x_coord = FRAME_RIGHT_INTERNAL_BORDER_END (f); |
| 428 | 8986 high_x_coord = FRAME_PIXWIDTH (f); |
| 8987 position = OVER_TOOLBAR; | |
| 8988 } | |
| 8989 else | |
| 8990 { | |
| 8991 low_x_coord = FRAME_PIXWIDTH (f); | |
| 8992 high_x_coord = x_coord; | |
| 8993 position = OVER_OUTSIDE; | |
| 8994 } | |
| 8995 } | |
| 8996 } | |
| 8997 | |
| 8998 #ifdef HAVE_TOOLBARS | |
| 8999 if (position == OVER_TOOLBAR) | |
| 9000 { | |
| 9001 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord); | |
| 9002 *obj2 = Qnil; | |
| 9003 *w = 0; | |
| 9004 UPDATE_CACHE_RETURN; | |
| 9005 } | |
| 9006 #endif /* HAVE_TOOLBARS */ | |
| 9007 | |
| 9008 /* We still have to return the window the pointer is next to and its | |
| 9009 relative y position even if it is outside the x boundary. */ | |
| 9010 if (x_coord < frm_left) | |
| 9011 x_coord = frm_left; | |
| 9012 else if (x_coord > frm_right) | |
| 9013 x_coord = frm_right; | |
| 9014 | |
| 9015 /* Same in reverse. */ | |
| 9016 if (y_coord < frm_top) | |
| 9017 y_coord = frm_top; | |
| 9018 else if (y_coord > frm_bottom) | |
| 9019 y_coord = frm_bottom; | |
| 9020 | |
| 9021 /* Find what window the given coordinates are actually in. */ | |
| 9022 window = f->root_window; | |
| 9023 *w = find_window_by_pixel_pos (x_coord, y_coord, window); | |
| 9024 | |
| 9025 /* If we didn't find a window, we're done. */ | |
| 9026 if (!*w) | |
| 9027 { | |
| 9028 UPDATE_CACHE_RETURN; | |
| 9029 } | |
| 9030 else if (position != OVER_NOTHING) | |
| 9031 { | |
| 9032 *closest = 0; | |
| 9033 *modeline_closest = -1; | |
| 9034 | |
| 9035 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom) | |
| 9036 { | |
| 9037 *w = 0; | |
| 9038 UPDATE_CACHE_RETURN; | |
| 9039 } | |
| 9040 } | |
| 9041 | |
| 9042 /* Check if the window is a minibuffer but isn't active. */ | |
| 9043 if (MINI_WINDOW_P (*w) && !minibuf_level) | |
| 9044 { | |
| 9045 /* Must reset the window value since some callers will ignore | |
| 4187 | 9046 the return value if it is set. */ |
| 428 | 9047 *w = 0; |
| 9048 UPDATE_CACHE_RETURN; | |
| 9049 } | |
| 9050 | |
| 9051 /* See if the point is over window vertical divider */ | |
| 9052 if (window_needs_vertical_divider (*w)) | |
| 9053 { | |
| 9054 int div_x_high = WINDOW_RIGHT (*w); | |
| 9055 int div_x_low = div_x_high - window_divider_width (*w); | |
| 9056 int div_y_high = WINDOW_BOTTOM (*w); | |
| 9057 int div_y_low = WINDOW_TOP (*w); | |
| 9058 | |
| 9059 if (div_x_low < x_coord && x_coord <= div_x_high && | |
| 9060 div_y_low < y_coord && y_coord <= div_y_high) | |
| 9061 { | |
| 9062 low_x_coord = div_x_low; | |
| 9063 high_x_coord = div_x_high; | |
| 9064 low_y_coord = div_y_low; | |
| 9065 high_y_coord = div_y_high; | |
| 9066 position = OVER_V_DIVIDER; | |
| 9067 UPDATE_CACHE_RETURN; | |
| 9068 } | |
| 9069 } | |
| 9070 | |
| 9071 dla = window_display_lines (*w, CURRENT_DISP); | |
| 9072 | |
| 9073 for (*row = 0; *row < Dynarr_length (dla); (*row)++) | |
| 9074 { | |
| 9075 int really_over_nothing = 0; | |
| 9076 struct display_line *dl = Dynarr_atp (dla, *row); | |
| 9077 | |
| 9078 if ((int) (dl->ypos - dl->ascent) <= y_coord | |
| 9079 && y_coord <= (int) (dl->ypos + dl->descent)) | |
| 9080 { | |
| 9081 int check_margin_glyphs = 0; | |
| 9082 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 9083 struct rune *rb = 0; | |
| 9084 | |
| 9085 if (x_coord < dl->bounds.left_white | |
| 9086 || x_coord >= dl->bounds.right_white) | |
| 9087 check_margin_glyphs = 1; | |
| 9088 | |
| 9089 low_y_coord = dl->ypos - dl->ascent; | |
| 9090 high_y_coord = dl->ypos + dl->descent + 1; | |
| 9091 | |
| 9092 if (position == OVER_BORDER | |
| 9093 || position == OVER_OUTSIDE | |
| 9094 || check_margin_glyphs) | |
| 9095 { | |
| 9096 int x_check, left_bound; | |
| 9097 | |
| 9098 if (check_margin_glyphs) | |
| 9099 { | |
| 9100 x_check = x_coord; | |
| 9101 left_bound = dl->bounds.left_white; | |
| 9102 } | |
| 9103 else | |
| 9104 { | |
| 9105 x_check = high_x_coord; | |
| 9106 left_bound = frm_left; | |
| 9107 } | |
| 9108 | |
| 9109 if (Dynarr_length (db->runes)) | |
| 9110 { | |
| 9111 if (x_check <= left_bound) | |
| 9112 { | |
| 9113 if (dl->modeline) | |
| 4967 | 9114 *modeline_closest = Dynarr_begin (db->runes)->charpos; |
| 428 | 9115 else |
| 4967 | 9116 *closest = Dynarr_begin (db->runes)->charpos; |
| 428 | 9117 } |
| 9118 else | |
| 9119 { | |
| 9120 if (dl->modeline) | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
9121 *modeline_closest = Dynarr_lastp (db->runes)->charpos; |
| 428 | 9122 else |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
9123 *closest = Dynarr_lastp (db->runes)->charpos; |
| 428 | 9124 } |
| 9125 | |
| 9126 if (dl->modeline) | |
| 9127 *modeline_closest += dl->offset; | |
| 9128 else | |
| 9129 *closest += dl->offset; | |
| 9130 } | |
| 9131 else | |
| 9132 { | |
| 9133 /* #### What should be here. */ | |
| 9134 if (dl->modeline) | |
| 9135 *modeline_closest = 0; | |
| 9136 else | |
| 9137 *closest = 0; | |
| 9138 } | |
| 9139 | |
| 9140 if (check_margin_glyphs) | |
| 9141 { | |
| 9142 if (x_coord < dl->bounds.left_in | |
| 9143 || x_coord >= dl->bounds.right_in) | |
| 9144 { | |
| 9145 /* If we are over the outside margins then we | |
| 4187 | 9146 know the loop over the text block isn't going |
| 9147 to accomplish anything. So we go ahead and | |
| 9148 set what information we can right here and | |
| 9149 return. */ | |
| 428 | 9150 (*row)--; |
| 9151 *obj_y = y_coord - (dl->ypos - dl->ascent); | |
| 9152 get_position_object (dl, obj1, obj2, x_coord, | |
| 9153 &low_x_coord, &high_x_coord); | |
| 9154 | |
| 9155 UPDATE_CACHE_RETURN; | |
| 9156 } | |
| 9157 } | |
| 9158 else | |
| 9159 UPDATE_CACHE_RETURN; | |
| 9160 } | |
| 9161 | |
| 9162 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++) | |
| 9163 { | |
|
5486
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9164 if (*col == Dynarr_length (db->runes)) |
| 428 | 9165 { |
|
5486
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9166 /* We've run out of runes to look at. Treat the same as |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9167 the case below where we failed to find a non-glyph |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9168 character. */ |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9169 if (dl->modeline) |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9170 *modeline_closest = dl->end_charpos + dl->offset; |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9171 else |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9172 *closest = dl->end_charpos + dl->offset; |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9173 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9174 if (check_margin_glyphs) |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9175 get_position_object (dl, obj1, obj2, x_coord, |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9176 &low_x_coord, &high_x_coord); |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9177 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9178 UPDATE_CACHE_RETURN; |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9179 } |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9180 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9181 rb = Dynarr_atp (db->runes, *col); |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9182 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9183 if (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width) |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9184 { |
| 428 | 9185 |
| 826 | 9186 *charpos = rb->charpos + dl->offset; |
| 428 | 9187 low_x_coord = rb->xpos; |
| 9188 high_x_coord = rb->xpos + rb->width; | |
| 9189 | |
| 9190 if (rb->type == RUNE_DGLYPH) | |
| 9191 { | |
| 9192 int elt = *col + 1; | |
| 9193 | |
| 9194 /* Find the first character after the glyph. */ | |
| 9195 while (elt < Dynarr_length (db->runes)) | |
| 9196 { | |
| 9197 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH) | |
| 9198 { | |
| 9199 if (dl->modeline) | |
| 9200 *modeline_closest = | |
| 826 | 9201 (Dynarr_atp (db->runes, elt)->charpos + |
| 428 | 9202 dl->offset); |
| 9203 else | |
| 9204 *closest = | |
| 826 | 9205 (Dynarr_atp (db->runes, elt)->charpos + |
| 428 | 9206 dl->offset); |
| 9207 break; | |
| 9208 } | |
| 9209 | |
| 9210 elt++; | |
| 9211 } | |
| 9212 | |
| 9213 /* In this case we failed to find a non-glyph | |
| 4187 | 9214 character so we return the last position |
| 9215 displayed on the line. */ | |
| 428 | 9216 if (elt == Dynarr_length (db->runes)) |
| 9217 { | |
| 9218 if (dl->modeline) | |
| 826 | 9219 *modeline_closest = dl->end_charpos + dl->offset; |
| 428 | 9220 else |
| 826 | 9221 *closest = dl->end_charpos + dl->offset; |
| 428 | 9222 really_over_nothing = 1; |
| 9223 } | |
| 9224 } | |
| 9225 else | |
| 9226 { | |
| 9227 if (dl->modeline) | |
| 826 | 9228 *modeline_closest = rb->charpos + dl->offset; |
| 428 | 9229 else |
| 826 | 9230 *closest = rb->charpos + dl->offset; |
| 428 | 9231 } |
| 9232 | |
| 9233 if (dl->modeline) | |
| 9234 { | |
| 9235 *row = window_displayed_height (*w); | |
| 9236 | |
| 9237 if (position == OVER_NOTHING) | |
| 9238 position = OVER_MODELINE; | |
| 9239 | |
| 9240 if (rb->type == RUNE_DGLYPH) | |
| 9241 { | |
| 9242 *obj1 = rb->object.dglyph.glyph; | |
| 9243 *obj2 = rb->object.dglyph.extent; | |
| 9244 } | |
| 9245 else if (rb->type == RUNE_CHAR) | |
| 9246 { | |
| 9247 *obj1 = Qnil; | |
| 9248 *obj2 = Qnil; | |
| 9249 } | |
| 9250 else | |
| 9251 { | |
| 9252 *obj1 = Qnil; | |
| 9253 *obj2 = Qnil; | |
| 9254 } | |
| 9255 | |
| 9256 UPDATE_CACHE_RETURN; | |
| 9257 } | |
|
5486
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9258 else if (rb->type == RUNE_CHAR |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9259 && rb->object.chr.ch == '\n') |
| 428 | 9260 { |
| 9261 (*row)--; | |
| 9262 /* At this point we may have glyphs in the right | |
| 4187 | 9263 inside margin. */ |
| 428 | 9264 if (check_margin_glyphs) |
| 9265 get_position_object (dl, obj1, obj2, x_coord, | |
| 9266 &low_x_coord, &high_x_coord); | |
| 9267 UPDATE_CACHE_RETURN; | |
| 9268 } | |
| 9269 else | |
| 9270 { | |
| 9271 (*row)--; | |
| 9272 if (rb->type == RUNE_DGLYPH) | |
| 9273 { | |
| 9274 *obj1 = rb->object.dglyph.glyph; | |
| 9275 *obj2 = rb->object.dglyph.extent; | |
| 9276 } | |
| 9277 else if (rb->type == RUNE_CHAR) | |
| 9278 { | |
| 9279 *obj1 = Qnil; | |
| 9280 *obj2 = Qnil; | |
| 9281 } | |
| 9282 else | |
| 9283 { | |
| 9284 *obj1 = Qnil; | |
| 9285 *obj2 = Qnil; | |
| 9286 } | |
| 9287 | |
| 9288 *obj_x = x_coord - rb->xpos; | |
| 9289 *obj_y = y_coord - (dl->ypos - dl->ascent); | |
| 9290 | |
| 9291 /* At this point we may have glyphs in the left | |
| 4187 | 9292 inside margin. */ |
| 428 | 9293 if (check_margin_glyphs) |
| 9294 get_position_object (dl, obj1, obj2, x_coord, 0, 0); | |
| 9295 | |
| 9296 if (position == OVER_NOTHING && !really_over_nothing) | |
| 9297 position = OVER_TEXT; | |
| 9298 | |
| 9299 UPDATE_CACHE_RETURN; | |
| 9300 } | |
| 9301 } | |
| 9302 } | |
| 9303 } | |
| 9304 } | |
| 9305 | |
| 9306 *row = Dynarr_length (dla) - 1; | |
| 9307 if (FRAME_WIN_P (f)) | |
| 9308 { | |
| 9309 int bot_elt = Dynarr_length (dla) - 1; | |
| 9310 | |
| 9311 if (bot_elt >= 0) | |
| 9312 { | |
| 9313 struct display_line *dl = Dynarr_atp (dla, bot_elt); | |
| 9314 int adj_area = y_coord - (dl->ypos + dl->descent); | |
| 9315 Lisp_Object lwin; | |
| 9316 int defheight; | |
| 9317 | |
| 793 | 9318 lwin = wrap_window (*w); |
|
5047
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
9319 default_face_width_and_height (lwin, 0, &defheight); |
| 428 | 9320 |
| 9321 *row += (adj_area / defheight); | |
| 9322 } | |
| 9323 } | |
| 9324 | |
| 9325 /* #### This should be checked out some more to determine what | |
| 9326 should really be going on. */ | |
| 9327 if (!MARKERP ((*w)->start[CURRENT_DISP])) | |
| 9328 *closest = 0; | |
| 9329 else | |
| 442 | 9330 *closest = end_of_last_line_may_error (*w, |
| 428 | 9331 marker_position ((*w)->start[CURRENT_DISP])); |
| 9332 *col = 0; | |
| 9333 UPDATE_CACHE_RETURN; | |
| 9334 } | |
| 9335 #undef UPDATE_CACHE_RETURN | |
| 9336 | |
| 9337 | |
| 9338 /***************************************************************************/ | |
| 9339 /* */ | |
| 9340 /* Lisp functions */ | |
| 9341 /* */ | |
| 9342 /***************************************************************************/ | |
| 9343 | |
| 9344 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /* | |
| 9345 Ensure that all minibuffers are correctly showing the echo area. | |
| 9346 */ | |
| 9347 ()) | |
| 9348 { | |
| 9349 Lisp_Object devcons, concons; | |
| 9350 | |
| 1318 | 9351 if (in_display) |
| 9352 return Qnil; | |
| 9353 | |
| 428 | 9354 DEVICE_LOOP_NO_BREAK (devcons, concons) |
| 9355 { | |
| 9356 struct device *d = XDEVICE (XCAR (devcons)); | |
| 9357 Lisp_Object frmcons; | |
| 9358 | |
| 1279 | 9359 if (DEVICE_STREAM_P (d)) |
| 9360 continue; | |
| 9361 | |
| 428 | 9362 DEVICE_FRAME_LOOP (frmcons, d) |
| 9363 { | |
| 9364 struct frame *f = XFRAME (XCAR (frmcons)); | |
| 853 | 9365 int depth; |
| 428 | 9366 |
| 9367 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f)) | |
| 9368 { | |
| 9369 Lisp_Object window = FRAME_MINIBUF_WINDOW (f); | |
| 442 | 9370 |
| 9371 MAYBE_DEVMETH (d, frame_output_begin, (f)); | |
| 9372 | |
| 428 | 9373 /* |
| 9374 * If the frame size has changed, there may be random | |
| 9375 * chud on the screen left from previous messages | |
| 9376 * because redisplay_frame hasn't been called yet. | |
| 9377 * Clear the screen to get rid of the potential mess. | |
| 9378 */ | |
| 9379 if (f->echo_area_garbaged) | |
| 9380 { | |
| 442 | 9381 MAYBE_DEVMETH (d, clear_frame, (f)); |
| 428 | 9382 f->echo_area_garbaged = 0; |
| 9383 } | |
| 853 | 9384 depth = enter_redisplay_critical_section (); |
| 428 | 9385 redisplay_window (window, 0); |
| 853 | 9386 exit_redisplay_critical_section (depth); |
| 442 | 9387 MAYBE_DEVMETH (d, frame_output_end, (f)); |
| 428 | 9388 } |
| 9389 } | |
| 9390 } | |
| 9391 | |
| 9392 return Qnil; | |
| 9393 } | |
| 9394 | |
| 9395 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /* | |
| 9396 Clear frame FRAME and output again what is supposed to appear on it. | |
| 9397 FRAME defaults to the selected frame if omitted. | |
| 9398 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9399 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9400 input and is guaranteed to proceed to completion. | |
| 9401 */ | |
| 9402 (frame, no_preempt)) | |
| 9403 { | |
| 9404 struct frame *f = decode_frame (frame); | |
| 9405 int count = specpdl_depth (); | |
| 9406 | |
| 9407 if (!NILP (no_preempt)) | |
| 853 | 9408 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9409 |
| 9410 f->clear = 1; | |
| 9411 redisplay_frame (f, 1); | |
| 9412 | |
| 442 | 9413 /* See the comment in Fredisplay_frame. */ |
| 9414 RESET_CHANGED_SET_FLAGS; | |
| 9415 | |
| 771 | 9416 return unbind_to (count); |
| 428 | 9417 } |
| 9418 | |
| 9419 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /* | |
| 9420 Ensure that FRAME's contents are correctly displayed. | |
| 9421 This differs from `redraw-frame' in that it only redraws what needs to | |
| 9422 be updated, as opposed to unconditionally clearing and redrawing | |
| 9423 the frame. | |
| 9424 FRAME defaults to the selected frame if omitted. | |
| 9425 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9426 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9427 input and is guaranteed to proceed to completion. | |
| 9428 */ | |
| 9429 (frame, no_preempt)) | |
| 9430 { | |
| 9431 struct frame *f = decode_frame (frame); | |
| 9432 int count = specpdl_depth (); | |
| 9433 | |
| 9434 if (!NILP (no_preempt)) | |
| 853 | 9435 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9436 |
| 9437 redisplay_frame (f, 1); | |
| 9438 | |
| 442 | 9439 /* If we don't reset the global redisplay flags here, subsequent |
| 9440 changes to the display will not get registered by redisplay | |
| 9441 because it thinks it already has registered changes. If you | |
| 9442 really knew what you were doing you could confuse redisplay by | |
| 9443 calling Fredisplay_frame while updating another frame. We assume | |
| 9444 that if you know what you are doing you will not be that | |
| 9445 stupid. */ | |
| 9446 RESET_CHANGED_SET_FLAGS; | |
| 9447 | |
| 771 | 9448 return unbind_to (count); |
| 428 | 9449 } |
| 9450 | |
| 9451 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /* | |
| 9452 Clear device DEVICE and output again what is supposed to appear on it. | |
| 9453 DEVICE defaults to the selected device if omitted. | |
| 9454 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9455 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9456 input and is guaranteed to proceed to completion. | |
| 9457 */ | |
| 9458 (device, no_preempt)) | |
| 9459 { | |
| 9460 struct device *d = decode_device (device); | |
| 9461 Lisp_Object frmcons; | |
| 9462 int count = specpdl_depth (); | |
| 9463 | |
| 9464 if (!NILP (no_preempt)) | |
| 853 | 9465 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9466 |
| 9467 DEVICE_FRAME_LOOP (frmcons, d) | |
| 9468 { | |
| 9469 XFRAME (XCAR (frmcons))->clear = 1; | |
| 9470 } | |
| 440 | 9471 redisplay_device (d, 0); |
| 428 | 9472 |
| 442 | 9473 /* See the comment in Fredisplay_frame. */ |
| 9474 RESET_CHANGED_SET_FLAGS; | |
| 9475 | |
| 771 | 9476 return unbind_to (count); |
| 428 | 9477 } |
| 9478 | |
| 9479 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /* | |
| 9480 Ensure that DEVICE's contents are correctly displayed. | |
| 9481 This differs from `redraw-device' in that it only redraws what needs to | |
| 9482 be updated, as opposed to unconditionally clearing and redrawing | |
| 9483 the device. | |
| 9484 DEVICE defaults to the selected device if omitted. | |
| 9485 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9486 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9487 input and is guaranteed to proceed to completion. | |
| 853 | 9488 |
| 9489 Note: If you simply want everything redisplayed, the current idiom is | |
| 9490 `(sit-for 0)'. | |
| 428 | 9491 */ |
| 9492 (device, no_preempt)) | |
| 9493 { | |
| 9494 struct device *d = decode_device (device); | |
| 9495 int count = specpdl_depth (); | |
| 9496 | |
| 9497 if (!NILP (no_preempt)) | |
| 853 | 9498 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9499 |
| 440 | 9500 redisplay_device (d, 0); |
| 428 | 9501 |
| 442 | 9502 /* See the comment in Fredisplay_frame. */ |
| 9503 RESET_CHANGED_SET_FLAGS; | |
| 9504 | |
| 771 | 9505 return unbind_to (count); |
| 428 | 9506 } |
| 9507 | |
| 9508 /* Big lie. Big lie. This will force all modelines to be updated | |
| 9509 regardless if the all flag is set or not. It remains in existence | |
| 9510 solely for backwards compatibility. */ | |
| 9511 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /* | |
| 9512 Force the modeline of the current buffer to be redisplayed. | |
| 9513 With optional non-nil ALL, force redisplay of all modelines. | |
| 9514 */ | |
| 2286 | 9515 (UNUSED (all))) |
| 428 | 9516 { |
| 9517 MARK_MODELINE_CHANGED; | |
| 9518 return Qnil; | |
| 9519 } | |
| 9520 | |
| 9521 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /* | |
| 9522 Force an immediate update of the cursor on FRAME. | |
| 9523 FRAME defaults to the selected frame if omitted. | |
| 9524 */ | |
| 9525 (frame)) | |
| 9526 { | |
| 1279 | 9527 struct frame *f = decode_frame (frame); |
| 9528 | |
| 9529 if (!FRAME_STREAM_P (f)) | |
| 9530 redisplay_redraw_cursor (f, 1); | |
| 428 | 9531 return Qnil; |
| 9532 } | |
| 9533 | |
| 9534 | |
| 9535 /***************************************************************************/ | |
| 9536 /* */ | |
| 872 | 9537 /* Change flags */ |
| 428 | 9538 /* */ |
| 9539 /***************************************************************************/ | |
| 9540 | |
| 9541 static void | |
| 2286 | 9542 margin_width_changed_in_frame (Lisp_Object UNUSED (specifier), |
| 9543 struct frame *UNUSED (f), | |
| 9544 Lisp_Object UNUSED (oldval)) | |
| 428 | 9545 { |
| 9546 /* Nothing to be done? */ | |
| 9547 } | |
| 9548 | |
| 9549 int | |
| 2286 | 9550 redisplay_variable_changed (Lisp_Object UNUSED (sym), |
| 9551 Lisp_Object *UNUSED (val), | |
| 9552 Lisp_Object UNUSED (in_object), | |
| 9553 int UNUSED (flags)) | |
| 428 | 9554 { |
| 9555 /* #### clip_changed should really be renamed something like | |
| 9556 global_redisplay_change. */ | |
| 9557 MARK_CLIP_CHANGED; | |
| 9558 return 0; | |
| 9559 } | |
| 9560 | |
| 9561 /* This is called if the built-in glyphs have their properties | |
| 9562 changed. */ | |
| 9563 void | |
| 2286 | 9564 redisplay_glyph_changed (Lisp_Object UNUSED (glyph), |
| 9565 Lisp_Object UNUSED (property), Lisp_Object locale) | |
| 428 | 9566 { |
| 9567 if (WINDOWP (locale)) | |
| 9568 { | |
| 9569 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale)))); | |
| 9570 } | |
| 9571 else if (FRAMEP (locale)) | |
| 9572 { | |
| 9573 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale)); | |
| 9574 } | |
| 9575 else if (DEVICEP (locale)) | |
| 9576 { | |
| 9577 Lisp_Object frmcons; | |
| 9578 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale)) | |
| 9579 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons))); | |
| 9580 } | |
| 9581 else if (CONSOLEP (locale)) | |
| 9582 { | |
| 9583 Lisp_Object frmcons, devcons; | |
| 9584 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale)) | |
| 9585 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons))); | |
| 9586 } | |
| 9587 else /* global or buffer */ | |
| 9588 { | |
| 9589 Lisp_Object frmcons, devcons, concons; | |
| 9590 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) | |
| 9591 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons))); | |
| 9592 } | |
| 9593 } | |
| 9594 | |
| 9595 static void | |
| 2286 | 9596 text_cursor_visible_p_changed (Lisp_Object UNUSED (specifier), |
| 9597 struct window *w, Lisp_Object UNUSED (oldval)) | |
| 428 | 9598 { |
| 9599 if (XFRAME (w->frame)->init_finished) | |
| 9600 Fforce_cursor_redisplay (w->frame); | |
| 9601 } | |
| 9602 | |
| 872 | 9603 void |
| 9604 mark_buffers_changed (void) | |
| 9605 { | |
| 9606 MARK_TYPE_CHANGED (buffers); | |
| 9607 } | |
| 9608 | |
| 9609 void | |
| 9610 mark_clip_changed (void) | |
| 9611 { | |
| 9612 MARK_TYPE_CHANGED (clip); | |
| 9613 } | |
| 9614 | |
| 9615 void | |
| 9616 mark_extents_changed (void) | |
| 9617 { | |
| 9618 MARK_TYPE_CHANGED (extents); | |
| 9619 } | |
| 9620 | |
| 9621 void | |
| 9622 mark_icon_changed (void) | |
| 9623 { | |
| 9624 MARK_TYPE_CHANGED (icon); | |
| 9625 } | |
| 9626 | |
| 9627 void | |
| 9628 mark_menubar_changed (void) | |
| 9629 { | |
| 9630 MARK_TYPE_CHANGED (menubar); | |
| 9631 } | |
| 9632 | |
| 9633 void | |
| 9634 mark_modeline_changed (void) | |
| 9635 { | |
| 9636 MARK_TYPE_CHANGED (modeline); | |
| 9637 } | |
| 9638 | |
| 9639 void | |
| 9640 mark_point_changed (void) | |
| 9641 { | |
| 9642 MARK_TYPE_CHANGED (point); | |
| 9643 } | |
| 9644 | |
| 9645 void | |
| 9646 mark_toolbar_changed (void) | |
| 9647 { | |
| 9648 MARK_TYPE_CHANGED (toolbar); | |
| 9649 } | |
| 9650 | |
| 9651 void | |
| 9652 mark_gutter_changed (void) | |
| 9653 { | |
| 9654 MARK_TYPE_CHANGED (gutter); | |
| 9655 } | |
| 9656 | |
| 9657 void | |
| 9658 mark_glyphs_changed (void) | |
| 9659 { | |
| 9660 MARK_TYPE_CHANGED (glyphs); | |
| 9661 } | |
| 9662 | |
| 9663 void | |
| 9664 mark_subwindows_changed (void) | |
| 9665 { | |
| 9666 MARK_TYPE_CHANGED (subwindows); | |
| 9667 } | |
| 9668 | |
| 9669 void | |
| 9670 mark_subwindows_state_changed (void) | |
| 9671 { | |
| 9672 MARK_TYPE_CHANGED (subwindows_state); | |
| 9673 } | |
| 9674 | |
| 428 | 9675 #ifdef MEMORY_USAGE_STATS |
| 9676 | |
| 9677 | |
| 9678 /***************************************************************************/ | |
| 9679 /* */ | |
| 9680 /* memory usage computation */ | |
| 9681 /* */ | |
| 9682 /***************************************************************************/ | |
| 9683 | |
| 9684 static int | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9685 compute_rune_dynarr_usage (rune_dynarr *dyn, struct usage_stats *ustats) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9686 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9687 return dyn ? Dynarr_memory_usage (dyn, ustats) : 0; |
| 428 | 9688 } |
| 9689 | |
| 9690 static int | |
| 9691 compute_display_block_dynarr_usage (display_block_dynarr *dyn, | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9692 struct usage_stats *ustats) |
| 428 | 9693 { |
| 9694 int total, i; | |
| 9695 | |
| 9696 if (!dyn) | |
| 9697 return 0; | |
| 9698 | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9699 total = Dynarr_memory_usage (dyn, ustats); |
| 428 | 9700 for (i = 0; i < Dynarr_largest (dyn); i++) |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9701 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ustats); |
| 428 | 9702 |
| 9703 return total; | |
| 9704 } | |
| 9705 | |
| 9706 static int | |
| 9707 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn, | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9708 struct usage_stats *ustats) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9709 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9710 return dyn ? Dynarr_memory_usage (dyn, ustats) : 0; |
| 428 | 9711 } |
| 9712 | |
| 9713 int | |
| 9714 compute_display_line_dynarr_usage (display_line_dynarr *dyn, | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9715 struct usage_stats *ustats) |
| 428 | 9716 { |
| 9717 int total, i; | |
| 9718 | |
| 9719 if (!dyn) | |
| 9720 return 0; | |
| 9721 | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9722 total = Dynarr_memory_usage (dyn, ustats); |
| 428 | 9723 for (i = 0; i < Dynarr_largest (dyn); i++) |
| 9724 { | |
| 9725 struct display_line *dl = &Dynarr_at (dyn, i); | |
| 5198 | 9726 total += compute_display_block_dynarr_usage (dl->display_blocks, ustats); |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9727 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ustats); |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9728 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ustats); |
| 428 | 9729 } |
| 9730 | |
| 9731 return total; | |
| 9732 } | |
| 9733 | |
| 9734 int | |
| 9735 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn, | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9736 struct usage_stats *ustats) |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9737 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9738 return dyn ? Dynarr_memory_usage (dyn, ustats) : 0; |
| 428 | 9739 } |
| 9740 | |
| 9741 #endif /* MEMORY_USAGE_STATS */ | |
| 9742 | |
| 1204 | 9743 #ifdef ERROR_CHECK_DISPLAY |
| 9744 | |
| 800 | 9745 static int |
| 2286 | 9746 sledgehammer_check_redisplay_structs_1 (struct window *w, |
| 9747 void *UNUSED (closure)) | |
| 800 | 9748 { |
| 9749 int i, j; | |
| 9750 display_line_dynarr *dl; | |
| 9751 | |
| 9752 dl = window_display_lines (w, CURRENT_DISP); | |
| 4187 | 9753 |
| 800 | 9754 for (i = 0; i < Dynarr_largest (dl); i++) |
| 9755 for (j = i + 1; j < Dynarr_largest (dl); j++) | |
| 9756 assert (Dynarr_atp (dl, i)->display_blocks != | |
| 9757 Dynarr_atp (dl, j)->display_blocks); | |
| 9758 | |
| 9759 dl = window_display_lines (w, DESIRED_DISP); | |
| 9760 | |
| 9761 for (i = 0; i < Dynarr_largest (dl); i++) | |
| 9762 for (j = i + 1; j < Dynarr_largest (dl); j++) | |
| 9763 assert (Dynarr_atp (dl, i)->display_blocks != | |
| 9764 Dynarr_atp (dl, j)->display_blocks); | |
| 9765 | |
| 9766 return 0; | |
| 9767 } | |
| 9768 | |
| 9769 static void | |
| 9770 sledgehammer_check_redisplay_structs (void) | |
| 9771 { | |
| 9772 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL); | |
| 9773 } | |
| 9774 | |
| 1204 | 9775 #endif /* ERROR_CHECK_DISPLAY */ |
| 9776 | |
| 428 | 9777 |
| 9778 /***************************************************************************/ | |
| 9779 /* */ | |
| 9780 /* initialization */ | |
| 9781 /* */ | |
| 9782 /***************************************************************************/ | |
| 9783 | |
| 9784 void | |
| 9785 init_redisplay (void) | |
| 9786 { | |
| 9787 disable_preemption = 0; | |
| 9788 preemption_count = 0; | |
| 9789 | |
| 9790 #ifndef PDUMP | |
| 9791 if (!initialized) | |
| 9792 #endif | |
| 9793 { | |
| 440 | 9794 if (!cmotion_display_lines) |
| 9795 cmotion_display_lines = Dynarr_new (display_line); | |
| 867 | 9796 if (!mode_spec_ibyte_string) |
| 9797 mode_spec_ibyte_string = Dynarr_new (Ibyte); | |
| 440 | 9798 if (!formatted_string_extent_dynarr) |
| 9799 formatted_string_extent_dynarr = Dynarr_new (EXTENT); | |
| 9800 if (!formatted_string_extent_start_dynarr) | |
| 9801 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount); | |
| 9802 if (!formatted_string_extent_end_dynarr) | |
| 9803 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount); | |
| 9804 if (!internal_cache) | |
| 9805 internal_cache = Dynarr_new (line_start_cache); | |
| 428 | 9806 } |
| 9807 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9808 if (!initialized) |
| 428 | 9809 return; |
| 9810 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9811 if (noninteractive) |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9812 { |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9813 Vinitial_device_type = Qstream; |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9814 return; |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9815 } |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9816 |
| 428 | 9817 /* If the user wants to use a window system, we shouldn't bother |
| 9818 initializing the terminal. This is especially important when the | |
| 9819 terminal is so dumb that emacs gives up before and doesn't bother | |
| 9820 using the window system. | |
| 9821 | |
| 9822 If the DISPLAY environment variable is set, try to use X, and die | |
| 9823 with an error message if that doesn't work. */ | |
| 9824 | |
| 9825 #ifdef HAVE_X_WINDOWS | |
| 9826 if (!strcmp (display_use, "x")) | |
| 9827 { | |
| 9828 /* Some stuff checks this way early. */ | |
| 9829 Vwindow_system = Qx; | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9830 Vinitial_device_type = Qx; |
| 428 | 9831 return; |
| 9832 } | |
| 9833 #endif /* HAVE_X_WINDOWS */ | |
| 9834 | |
| 462 | 9835 #ifdef HAVE_GTK |
| 9836 if (!strcmp (display_use, "gtk")) | |
| 9837 { | |
| 9838 Vwindow_system = Qgtk; | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9839 Vinitial_device_type = Qgtk; |
| 462 | 9840 return; |
| 9841 } | |
| 9842 #endif | |
| 9843 | |
| 428 | 9844 #ifdef HAVE_MS_WINDOWS |
| 9845 if (!strcmp (display_use, "mswindows")) | |
| 9846 { | |
| 9847 /* Some stuff checks this way early. */ | |
| 9848 Vwindow_system = Qmswindows; | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9849 Vinitial_device_type = Qmswindows; |
| 428 | 9850 return; |
| 9851 } | |
| 9852 #endif /* HAVE_MS_WINDOWS */ | |
| 9853 | |
| 9854 #ifdef HAVE_TTY | |
| 9855 /* If no window system has been specified, try to use the terminal. */ | |
| 9856 if (!isatty (0)) | |
| 9857 { | |
| 9858 stderr_out ("XEmacs: standard input is not a tty\n"); | |
| 9859 exit (1); | |
| 9860 } | |
| 9861 | |
| 9862 /* Look at the TERM variable */ | |
| 771 | 9863 if (!egetenv ("TERM")) |
| 428 | 9864 { |
| 9865 stderr_out ("Please set the environment variable TERM; see tset(1).\n"); | |
| 9866 exit (1); | |
| 9867 } | |
| 9868 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9869 Vinitial_device_type = Qtty; |
| 428 | 9870 return; |
| 9871 #else /* not HAVE_TTY */ | |
| 9872 /* No DISPLAY specified, and no TTY support. */ | |
| 9873 stderr_out ("XEmacs: Cannot open display.\n\ | |
| 9874 Please set the environmental variable DISPLAY to an appropriate value.\n"); | |
| 9875 exit (1); | |
| 9876 #endif | |
| 9877 /* Unreached. */ | |
| 9878 } | |
| 9879 | |
| 9880 void | |
| 9881 syms_of_redisplay (void) | |
| 9882 { | |
| 563 | 9883 DEFSYMBOL (Qcursor_in_echo_area); |
| 9884 DEFSYMBOL (Qdisplay_warning_buffer); | |
| 9885 DEFSYMBOL (Qbar_cursor); | |
| 9886 DEFSYMBOL (Qtop_bottom); | |
| 9887 DEFSYMBOL (Qbuffer_list_changed_hook); | |
| 428 | 9888 |
| 9889 DEFSUBR (Fredisplay_echo_area); | |
| 9890 DEFSUBR (Fredraw_frame); | |
| 9891 DEFSUBR (Fredisplay_frame); | |
| 9892 DEFSUBR (Fredraw_device); | |
| 9893 DEFSUBR (Fredisplay_device); | |
| 9894 DEFSUBR (Fredraw_modeline); | |
| 9895 DEFSUBR (Fforce_cursor_redisplay); | |
| 9896 } | |
| 9897 | |
| 9898 void | |
| 9899 vars_of_redisplay (void) | |
| 9900 { | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4928
diff
changeset
|
9901 QSin_redisplay = build_defer_string ("(in redisplay)"); |
| 1292 | 9902 staticpro (&QSin_redisplay); |
| 428 | 9903 |
| 1318 | 9904 Vpost_redisplay_actions = Qnil; |
| 9905 staticpro (&Vpost_redisplay_actions); | |
| 9906 | |
| 428 | 9907 #if 0 |
| 9908 staticpro (&last_arrow_position); | |
| 9909 staticpro (&last_arrow_string); | |
| 9910 last_arrow_position = Qnil; | |
| 9911 last_arrow_string = Qnil; | |
| 9912 #endif /* 0 */ | |
| 9913 | |
| 9914 /* #### Probably temporary */ | |
| 9915 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /* | |
| 9916 \(Temporary) Setting this will impact the performance of the internal | |
| 9917 line start cache. | |
| 9918 */ ); | |
| 9919 cache_adjustment = 2; | |
| 9920 | |
| 1268 | 9921 DEFVAR_INT ("maximum-preempts", &max_preempts /* |
| 9922 Maximum number of times redisplay can be preempted by user input. | |
| 9923 */ ); | |
| 9924 max_preempts = INIT_MAX_PREEMPTS; | |
| 9925 | |
| 428 | 9926 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /* |
| 9927 Minimum pixel height for clipped bottom display line. | |
| 9928 A clipped line shorter than this won't be displayed. | |
| 9929 */ , | |
| 9930 redisplay_variable_changed); | |
| 9931 vertical_clip = 5; | |
| 9932 | |
| 9933 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /* | |
| 9934 Minimum visible area for clipped glyphs at right boundary. | |
| 9935 Clipped glyphs shorter than this won't be displayed. | |
| 9936 Only pixmap glyph instances are currently allowed to be clipped. | |
| 9937 */ , | |
| 9938 redisplay_variable_changed); | |
| 9939 horizontal_clip = 5; | |
| 9940 | |
| 9941 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /* | |
| 9942 String displayed by modeline-format's "%m" specification. | |
| 9943 */ ); | |
| 9944 Vglobal_mode_string = Qnil; | |
| 9945 | |
| 9946 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /* | |
| 9947 Marker for where to display an arrow on top of the buffer text. | |
| 9948 This must be the beginning of a line in order to work. | |
| 9949 See also `overlay-arrow-string'. | |
| 9950 */ , | |
| 9951 redisplay_variable_changed); | |
| 9952 Voverlay_arrow_position = Qnil; | |
| 9953 | |
| 9954 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /* | |
| 442 | 9955 String or glyph to display as an arrow. See also `overlay-arrow-position'. |
| 444 | 9956 \(Note that despite the name of this variable, it can be set to a glyph as |
| 442 | 9957 well as a string.) |
| 428 | 9958 */ , |
| 9959 redisplay_variable_changed); | |
| 9960 Voverlay_arrow_string = Qnil; | |
| 9961 | |
| 9962 DEFVAR_INT ("scroll-step", &scroll_step /* | |
| 9963 *The number of lines to try scrolling a window by when point moves out. | |
| 9964 If that fails to bring point back on frame, point is centered instead. | |
| 9965 If this is zero, point is always centered after it moves off screen. | |
| 9966 */ ); | |
| 9967 scroll_step = 0; | |
| 9968 | |
| 9969 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /* | |
| 9970 *Scroll up to this many lines, to bring point back on screen. | |
| 9971 */ ); | |
| 9972 scroll_conservatively = 0; | |
| 9973 | |
| 9974 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows", | |
| 9975 &truncate_partial_width_windows /* | |
| 9976 *Non-nil means truncate lines in all windows less than full frame wide. | |
| 9977 */ , | |
| 9978 redisplay_variable_changed); | |
| 9979 truncate_partial_width_windows = 1; | |
| 9980 | |
| 442 | 9981 DEFVAR_LISP ("visible-bell", &Vvisible_bell /* |
| 9982 *Non-nil substitutes a visual signal for the audible bell. | |
| 9983 | |
| 9984 Default behavior is to flash the whole screen. On some platforms, | |
| 9985 special effects are available using the following values: | |
| 9986 | |
| 3025 | 9987 `display' Flash the whole screen (ie, the default behavior). |
| 9988 `top-bottom' Flash only the top and bottom lines of the selected frame. | |
| 442 | 9989 |
| 9990 When effects are unavailable on a platform, the visual bell is the | |
| 9991 default, whole screen. (Currently only X supports any special effects.) | |
| 428 | 9992 */ ); |
| 442 | 9993 Vvisible_bell = Qnil; |
| 428 | 9994 |
| 9995 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /* | |
| 9996 *Non-nil means no need to redraw entire frame after suspending. | |
| 9997 A non-nil value is useful if the terminal can automatically preserve | |
| 9998 Emacs's frame display when you reenter Emacs. | |
| 9999 It is up to you to set this variable if your terminal can do that. | |
| 10000 */ ); | |
| 10001 no_redraw_on_reenter = 0; | |
| 10002 | |
| 10003 DEFVAR_LISP ("window-system", &Vwindow_system /* | |
| 10004 A symbol naming the window-system under which Emacs is running, | |
| 10005 such as `x', or nil if emacs is running on an ordinary terminal. | |
| 10006 | |
| 10007 Do not use this variable, except for GNU Emacs compatibility, as it | |
| 10008 gives wrong values in a multi-device environment. Use `console-type' | |
| 10009 instead. | |
| 10010 */ ); | |
| 10011 Vwindow_system = Qnil; | |
| 10012 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10013 DEFVAR_CONST_LISP ("initial-device-type", &Vinitial_device_type /* |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10014 The type of the first XEmacs device to be created. |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10015 |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10016 This is constant; it's used by the command line handling code to communicate |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10017 to Lisp what type the initial device to be created should be. |
| 428 | 10018 */ ); |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10019 Vinitial_device_type = Qnil; |
| 428 | 10020 |
| 10021 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /* | |
| 10022 Non-nil means put cursor in minibuffer, at end of any message there. | |
| 10023 */ ); | |
| 10024 cursor_in_echo_area = 0; | |
| 10025 | |
| 10026 /* #### Shouldn't this be generalized as follows: | |
| 10027 | |
| 10028 if nil, use block cursor. | |
| 10029 if a number, use a bar cursor of that width. | |
| 10030 Otherwise, use a 1-pixel bar cursor. | |
| 10031 | |
| 10032 #### Or better yet, this variable should be trashed entirely | |
| 10033 (use a Lisp-magic variable to maintain compatibility) | |
| 10034 and a specifier `cursor-shape' added, which allows a block | |
| 10035 cursor, a bar cursor, a flashing block or bar cursor, | |
| 10036 maybe a caret cursor, etc. */ | |
| 10037 | |
| 10038 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /* | |
| 448 | 10039 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2. |
| 428 | 10040 */ ); |
| 10041 Vbar_cursor = Qnil; | |
| 10042 | |
| 442 | 10043 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /* |
| 10044 Function or functions to call when a frame's buffer list has changed. | |
| 10045 This is called during redisplay, before redisplaying each frame. | |
| 10046 Functions on this hook are called with one argument, the frame. | |
| 10047 */ ); | |
| 10048 Vbuffer_list_changed_hook = Qnil; | |
| 10049 | |
| 428 | 10050 DEFVAR_INT ("display-warning-tick", &display_warning_tick /* |
| 10051 Bump this to tell the C code to call `display-warning-buffer' | |
| 10052 at next redisplay. You should not normally change this; the function | |
| 10053 `display-warning' automatically does this at appropriate times. | |
| 10054 */ ); | |
| 10055 display_warning_tick = 0; | |
| 10056 | |
| 10057 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /* | |
| 10058 Non-nil means inhibit display of warning messages. | |
| 10059 You should *bind* this, not set it. Any pending warning messages | |
| 10060 will be displayed when the binding no longer applies. | |
| 10061 */ ); | |
| 10062 /* reset to 0 by startup.el after the splash screen has displayed. | |
| 10063 This way, the warnings don't obliterate the splash screen. */ | |
| 10064 inhibit_warning_display = 1; | |
| 10065 | |
| 10066 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /* | |
| 10067 *Non-nil means column display number starts at 1. | |
| 10068 */ ); | |
| 10069 column_number_start_at_one = 0; | |
| 10070 } | |
| 10071 | |
| 10072 void | |
| 10073 specifier_vars_of_redisplay (void) | |
| 10074 { | |
| 10075 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /* | |
| 10076 *Width of left margin. | |
| 10077 This is a specifier; use `set-specifier' to change it. | |
| 10078 */ ); | |
| 10079 Vleft_margin_width = Fmake_specifier (Qnatnum); | |
| 10080 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero))); | |
| 10081 set_specifier_caching (Vleft_margin_width, | |
| 438 | 10082 offsetof (struct window, left_margin_width), |
| 428 | 10083 some_window_value_changed, |
| 438 | 10084 offsetof (struct frame, left_margin_width), |
| 444 | 10085 margin_width_changed_in_frame, 0); |
| 428 | 10086 |
| 10087 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /* | |
| 10088 *Width of right margin. | |
| 10089 This is a specifier; use `set-specifier' to change it. | |
| 10090 */ ); | |
| 10091 Vright_margin_width = Fmake_specifier (Qnatnum); | |
| 10092 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero))); | |
| 10093 set_specifier_caching (Vright_margin_width, | |
| 438 | 10094 offsetof (struct window, right_margin_width), |
| 428 | 10095 some_window_value_changed, |
| 438 | 10096 offsetof (struct frame, right_margin_width), |
| 444 | 10097 margin_width_changed_in_frame, 0); |
| 428 | 10098 |
| 10099 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /* | |
| 10100 *Minimum ascent height of lines. | |
| 10101 This is a specifier; use `set-specifier' to change it. | |
| 10102 */ ); | |
| 10103 Vminimum_line_ascent = Fmake_specifier (Qnatnum); | |
| 10104 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero))); | |
| 10105 set_specifier_caching (Vminimum_line_ascent, | |
| 438 | 10106 offsetof (struct window, minimum_line_ascent), |
| 428 | 10107 some_window_value_changed, |
| 444 | 10108 0, 0, 0); |
| 428 | 10109 |
| 10110 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /* | |
| 10111 *Minimum descent height of lines. | |
| 10112 This is a specifier; use `set-specifier' to change it. | |
| 10113 */ ); | |
| 10114 Vminimum_line_descent = Fmake_specifier (Qnatnum); | |
| 10115 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero))); | |
| 10116 set_specifier_caching (Vminimum_line_descent, | |
| 438 | 10117 offsetof (struct window, minimum_line_descent), |
| 428 | 10118 some_window_value_changed, |
| 444 | 10119 0, 0, 0); |
| 428 | 10120 |
| 10121 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /* | |
| 10122 *Non-nil means use the left outside margin as extra whitespace when | |
| 3025 | 10123 displaying `whitespace' or `inside-margin' glyphs. |
| 428 | 10124 This is a specifier; use `set-specifier' to change it. |
| 10125 */ ); | |
| 10126 Vuse_left_overflow = Fmake_specifier (Qboolean); | |
| 10127 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil))); | |
| 10128 set_specifier_caching (Vuse_left_overflow, | |
| 438 | 10129 offsetof (struct window, use_left_overflow), |
| 428 | 10130 some_window_value_changed, |
| 444 | 10131 0, 0, 0); |
| 428 | 10132 |
| 10133 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /* | |
| 10134 *Non-nil means use the right outside margin as extra whitespace when | |
| 3025 | 10135 displaying `whitespace' or `inside-margin' glyphs. |
| 428 | 10136 This is a specifier; use `set-specifier' to change it. |
| 10137 */ ); | |
| 10138 Vuse_right_overflow = Fmake_specifier (Qboolean); | |
| 10139 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil))); | |
| 10140 set_specifier_caching (Vuse_right_overflow, | |
| 438 | 10141 offsetof (struct window, use_right_overflow), |
| 428 | 10142 some_window_value_changed, |
| 444 | 10143 0, 0, 0); |
| 428 | 10144 |
| 10145 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /* | |
| 10146 *Non-nil means the text cursor is visible (this is usually the case). | |
| 10147 This is a specifier; use `set-specifier' to change it. | |
| 10148 */ ); | |
| 10149 Vtext_cursor_visible_p = Fmake_specifier (Qboolean); | |
| 10150 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt))); | |
| 10151 set_specifier_caching (Vtext_cursor_visible_p, | |
| 438 | 10152 offsetof (struct window, text_cursor_visible_p), |
| 428 | 10153 text_cursor_visible_p_changed, |
| 444 | 10154 0, 0, 0); |
| 428 | 10155 |
| 10156 } |