Mercurial > hg > xemacs-beta
annotate src/redisplay.c @ 5652:cc6f0266bc36
Avoid #'delq in core Lisp, for the sake of style, a very slightly smaller binary
lisp/ChangeLog addition:
2012-05-01 Aidan Kehoe <kehoea@parhasard.net>
Avoid #'delq in core code, for the sake of style and a (very
slightly) smaller binary.
* behavior.el (disable-behavior):
* behavior.el (compute-behavior-group-children):
* buff-menu.el (buffers-tab-items):
* byte-optimize.el (byte-optimize-delay-constants-math):
* byte-optimize.el (byte-optimize-logmumble):
* byte-optimize.el (byte-decompile-bytecode-1):
* byte-optimize.el (byte-optimize-lapcode):
* bytecomp.el:
* bytecomp.el (byte-compile-arglist-warn):
* bytecomp.el (byte-compile-warn-about-unresolved-functions):
* bytecomp.el (byte-compile-lambda):
* bytecomp.el (byte-compile-out-toplevel):
* bytecomp.el (byte-compile-insert):
* bytecomp.el (byte-compile-defalias-warn):
* cl-macs.el (cl-upcase-arg):
* cl-macs.el (cl-transform-lambda):
* cl-macs.el (cl-do-proclaim):
* cl-macs.el (defstruct):
* cl-macs.el (cl-make-type-test):
* cl-macs.el (define-compiler-macro):
* cl-macs.el (delete-duplicates):
* cus-edit.el (widget-face-value-delete):
* cus-edit.el (face-history):
* easymenu.el (easy-menu-remove):
* files.el (files-fetch-hook-value):
* files.el (file-expand-wildcards):
* font-lock.el (font-lock-update-removed-keyword-alist):
* font-lock.el (font-lock-remove-keywords):
* frame.el (frame-initialize):
* frame.el (frame-notice-user-settings):
* frame.el (set-frame-font):
* frame.el (delete-other-frames):
* frame.el (get-frame-for-buffer-noselect):
* gnuserv.el (gnuserv-kill-buffer-function):
* gnuserv.el (gnuserv-check-device):
* gnuserv.el (gnuserv-kill-client):
* gnuserv.el (gnuserv-buffer-done-1):
* gtk-font-menu.el (gtk-reset-device-font-menus):
* gutter-items.el (buffers-tab-items):
* gutter.el (set-gutter-element-visible-p):
* info.el (Info-find-file-node):
* info.el (Info-history-add):
* info.el (Info-build-annotation-completions):
* info.el (Info-index):
* info.el (Info-reannotate-node):
* itimer.el (delete-itimer):
* itimer.el (start-itimer):
* lib-complete.el (lib-complete:cache-completions):
* loadhist.el (unload-feature):
* menubar-items.el (build-buffers-menu-internal):
* menubar.el (delete-menu-item):
* menubar.el (relabel-menu-item):
* msw-font-menu.el (mswindows-reset-device-font-menus):
* mule/make-coding-system.el (fixed-width-generate-helper):
* next-error.el (next-error-find-buffer):
* obsolete.el:
* obsolete.el (find-non-ascii-charset-string):
* obsolete.el (find-non-ascii-charset-region):
* occur.el (multi-occur-by-filename-regexp):
* occur.el (occur-1):
* packages.el (packages-package-hierarchy-directory-names):
* packages.el (package-get-key-1):
* process.el (setenv):
* simple.el (undo):
* simple.el (handle-pre-motion-command-current-command-is-motion):
* sound.el (load-sound-file):
* wid-edit.el (widget-field-value-delete):
* wid-edit.el (widget-checklist-match-inline):
* wid-edit.el (widget-checklist-match-find):
* wid-edit.el (widget-editable-list-delete-at):
* wid-edit.el (widget-editable-list-entry-create):
* window.el (quit-window):
* x-font-menu.el (x-reset-device-font-menus-core):
1. Replace (delq nil (mapcar ....)) with analogous (mapcan ...)
forms; this is in non-dumped files, it was done previously in
dumped files.
2. Replace (delq FOO (copy-sequence BAR)) with (remove* FOO BAR),
where #'eq and #'eql are equivalent
3. Replace (delq FOO BAR) with (delete* FOO BAR), where FOO is not
a non-fixnum number. Saves a little space in the dumped file
(since the compiler macro adds :test #'eq to the delete* call if
it's not clear that FOO is not a non-fixnum number).
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 01 May 2012 16:17:42 +0100 |
| parents | 81fee4aee9b6 |
| children | b6c506c30f93 |
| 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), |
|
5628
81fee4aee9b6
text_width methods interface cleanup.
Didier Verna <didier@xemacs.org>
parents:
5619
diff
changeset
|
642 text_width, (WINDOW_XFRAME (w), |
|
81fee4aee9b6
text_width methods interface cleanup.
Didier Verna <didier@xemacs.org>
parents:
5619
diff
changeset
|
643 WINDOW_FACE_CACHEL (w, findex), str, |
|
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
|
644 len)); |
| 428 | 645 } |
| 646 | |
| 867 | 647 static Ichar_dynarr *rtw_ichar_dynarr; |
| 428 | 648 |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
649 static int |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
650 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
|
651 Ibyte *nonreloc, Lisp_Object reloc, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
652 Bytecount offset, Bytecount len) |
| 428 | 653 { |
| 867 | 654 if (!rtw_ichar_dynarr) |
| 655 rtw_ichar_dynarr = Dynarr_new (Ichar); | |
| 656 Dynarr_reset (rtw_ichar_dynarr); | |
| 428 | 657 |
| 658 fixup_internal_substring (nonreloc, reloc, offset, &len); | |
| 659 if (STRINGP (reloc)) | |
| 660 nonreloc = XSTRING_DATA (reloc); | |
| 867 | 661 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
|
662 return redisplay_window_text_width_ichar_string |
| 4967 | 663 (w, findex, Dynarr_begin (rtw_ichar_dynarr), |
| 867 | 664 Dynarr_length (rtw_ichar_dynarr)); |
| 428 | 665 } |
| 666 | |
| 667 int | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
668 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
|
669 Ibyte *nonreloc, Lisp_Object reloc, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
670 Bytecount offset, Bytecount len) |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
671 { |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
672 Lisp_Object window = DOMAIN_WINDOW (domain); |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
673 Lisp_Object frame = DOMAIN_FRAME (domain); |
| 428 | 674 unsigned char charsets[NUM_LEADING_BYTES]; |
| 675 struct face_cachel cachel; | |
| 676 | |
| 867 | 677 if (!rtw_ichar_dynarr) |
| 678 rtw_ichar_dynarr = Dynarr_new (Ichar); | |
| 679 Dynarr_reset (rtw_ichar_dynarr); | |
| 428 | 680 |
| 681 fixup_internal_substring (nonreloc, reloc, offset, &len); | |
| 682 if (STRINGP (reloc)) | |
| 683 nonreloc = XSTRING_DATA (reloc); | |
| 867 | 684 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr); |
| 685 find_charsets_in_ibyte_string (charsets, nonreloc, len); | |
| 428 | 686 reset_face_cachel (&cachel); |
| 687 cachel.face = face; | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
688 ensure_face_cachel_complete (&cachel, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
689 NILP (window) ? frame : window, |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
690 charsets); |
|
5628
81fee4aee9b6
text_width methods interface cleanup.
Didier Verna <didier@xemacs.org>
parents:
5619
diff
changeset
|
691 return DEVMETH (FRAME_XDEVICE (XFRAME (frame)), |
|
81fee4aee9b6
text_width methods interface cleanup.
Didier Verna <didier@xemacs.org>
parents:
5619
diff
changeset
|
692 text_width, (XFRAME (frame), |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
693 &cachel, |
| 4967 | 694 Dynarr_begin (rtw_ichar_dynarr), |
| 867 | 695 Dynarr_length (rtw_ichar_dynarr))); |
| 428 | 696 } |
| 697 | |
| 698 /* Return the display block from DL of the given TYPE. A display line | |
| 699 can have only one display block of each possible type. If DL does | |
| 700 not have a block of type TYPE, one will be created and added to DL. */ | |
| 701 | |
| 702 struct display_block * | |
| 703 get_display_block_from_line (struct display_line *dl, enum display_type type) | |
| 704 { | |
| 705 int elt; | |
| 706 struct display_block db; | |
| 707 | |
| 708 /* Check if this display line already has a block of the desired type and | |
| 709 if so, return it. */ | |
| 710 if (dl->display_blocks) | |
| 711 { | |
| 712 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++) | |
| 713 { | |
| 714 if (Dynarr_at (dl->display_blocks, elt).type == type) | |
| 715 return Dynarr_atp (dl->display_blocks, elt); | |
| 716 } | |
| 717 | |
| 718 /* There isn't an active block of the desired type, but there | |
| 4187 | 719 might still be allocated blocks we need to reuse. */ |
| 428 | 720 if (elt < Dynarr_largest (dl->display_blocks)) |
| 721 { | |
| 722 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt); | |
| 723 | |
| 3025 | 724 /* "add" the block to the list */ |
| 5038 | 725 Dynarr_incrementr (dl->display_blocks); |
| 428 | 726 |
| 727 /* initialize and return */ | |
| 728 dbp->type = type; | |
| 729 return dbp; | |
| 730 } | |
| 731 } | |
| 732 else | |
| 733 { | |
| 734 /* This line doesn't have any display blocks, so initialize the display | |
| 4187 | 735 bock array. */ |
| 428 | 736 dl->display_blocks = Dynarr_new (display_block); |
| 737 } | |
| 738 | |
| 739 /* The line doesn't have a block of the desired type so go ahead and create | |
| 740 one and add it to the line. */ | |
| 741 xzero (db); | |
| 742 db.type = type; | |
| 743 db.runes = Dynarr_new (rune); | |
| 744 Dynarr_add (dl->display_blocks, db); | |
| 745 | |
| 746 /* Return the newly added display block. */ | |
| 747 elt = Dynarr_length (dl->display_blocks) - 1; | |
| 748 | |
| 749 return Dynarr_atp (dl->display_blocks, elt); | |
| 750 } | |
| 751 | |
| 752 static int | |
| 753 tab_char_width (struct window *w) | |
| 754 { | |
| 755 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
|
756 int char_tab_width = XFIXNUM (b->tab_width); |
| 428 | 757 |
| 758 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8; | |
| 759 | |
| 760 return char_tab_width; | |
| 761 } | |
| 762 | |
| 763 static int | |
| 764 space_width (struct window *w) | |
| 765 { | |
| 3659 | 766 /* While tabs are traditionally composed of spaces, for variable-width |
| 428 | 767 fonts the space character tends to give too narrow a value. So |
| 768 we use 'n' instead. Except that we don't. We use the default | |
| 769 character width for the default face. If this is actually | |
| 770 defined by the font then it is probably the best thing to | |
| 771 actually use. If it isn't, we have assumed it is 'n' and have | |
| 772 already calculated its width. Thus we can avoid a call to | |
| 773 XTextWidth on X frames by just querying the default width. */ | |
| 774 return XFONT_INSTANCE | |
| 775 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width; | |
| 776 } | |
| 777 | |
| 778 static int | |
| 779 tab_pix_width (struct window *w) | |
| 780 { | |
| 781 return space_width (w) * tab_char_width (w); | |
| 782 } | |
| 783 | |
| 784 /* Given a pixel position in a window, return the pixel location of | |
| 785 the next tabstop. Tabs are calculated from the left window edge in | |
| 786 terms of spaces displayed in the default face. Formerly the space | |
| 787 width was determined using the currently active face. That method | |
| 788 leads to tabstops which do not line up. */ | |
| 789 | |
| 790 static int | |
| 791 next_tab_position (struct window *w, int start_pixpos, int left_pixpos) | |
| 792 { | |
| 793 int n_pos = left_pixpos; | |
| 794 int pix_tab_width = tab_pix_width (w); | |
| 795 | |
| 796 /* Adjust n_pos for any hscrolling which has happened. */ | |
| 797 if (WINDOW_SCROLLED (w)) | |
| 798 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset; | |
| 799 | |
| 800 while (n_pos <= start_pixpos) | |
| 801 n_pos += pix_tab_width; | |
| 802 | |
| 803 return n_pos; | |
| 804 } | |
| 805 | |
| 806 /* For the given window, calculate the outside and margin boundaries for a | |
| 807 display line. The whitespace boundaries must be calculated by the text | |
| 808 layout routines. */ | |
| 809 | |
| 810 layout_bounds | |
| 811 calculate_display_line_boundaries (struct window *w, int modeline) | |
| 812 { | |
| 813 layout_bounds bounds; | |
| 814 | |
| 815 /* Set the outermost boundaries which are the boundaries of the | |
| 816 window itself minus the gutters (and minus the scrollbars if this | |
| 817 is for the modeline). */ | |
| 818 if (!modeline) | |
| 819 { | |
| 820 bounds.left_out = WINDOW_TEXT_LEFT (w); | |
| 821 bounds.right_out = WINDOW_TEXT_RIGHT (w); | |
| 822 } | |
| 823 else | |
| 824 { | |
| 825 bounds.left_out = WINDOW_MODELINE_LEFT (w); | |
| 826 bounds.right_out = WINDOW_MODELINE_RIGHT (w); | |
| 827 } | |
| 828 | |
| 829 /* The inner boundaries mark where the glyph margins are located. */ | |
| 830 bounds.left_in = bounds.left_out + window_left_margin_width (w); | |
| 831 bounds.right_in = bounds.right_out - window_right_margin_width (w); | |
| 832 | |
| 833 /* We cannot fully calculate the whitespace boundaries as they | |
| 834 depend on the contents of the line being displayed. */ | |
| 835 bounds.left_white = bounds.left_in; | |
| 836 bounds.right_white = bounds.right_in; | |
| 837 | |
| 838 return bounds; | |
| 839 } | |
| 840 | |
| 819 | 841 /* This takes a display_block and its containing line and corrects the yoffset |
| 842 of each glyph in the block to cater for the ascent of the line as a | |
| 843 whole. Must be called *after* the line-ascent is known! */ | |
| 844 | |
| 845 static void | |
| 846 calculate_yoffset (struct display_line *dl, struct display_block *fixup) | |
| 847 { | |
| 848 int i; | |
| 849 for (i=0; i<Dynarr_length (fixup->runes); i++) | |
| 850 { | |
| 851 struct rune *r = Dynarr_atp (fixup->runes,i); | |
| 852 if (r->type == RUNE_DGLYPH) | |
| 4187 | 853 { |
| 854 if (r->object.dglyph.ascent < dl->ascent) | |
| 855 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent + | |
| 819 | 856 r->object.dglyph.descent; |
| 4187 | 857 } |
| 819 | 858 } |
| 859 } | |
| 860 | |
| 861 /* Calculate the textual baseline (the ascent and descent values for the | |
| 862 display_line as a whole). | |
| 863 | |
| 864 If the baseline is completely blank, or contains no manually positioned | |
| 865 glyphs, then the textual baseline is simply the baseline of the default font. | |
| 866 (The `contains no manually positioned glyphs' part is actually done for | |
| 867 | 867 us by `add_ichar_rune'.) |
| 819 | 868 |
| 869 If the baseline contains pixmaps, and they're all manually positioned, then | |
| 870 the textual baseline location is constrained that way, and we need do no | |
| 871 work. | |
| 872 | |
| 873 If the baseline contains pixmaps, and at least one is automatically | |
| 874 positioned, then the textual ascent is the largest ascent on the line, and | |
| 875 the textual descent is the largest descent (which is how things are set up at | |
| 876 entry to this function anyway): except that if the max_ascent + max_descent | |
| 877 is too small for the height of the line (say you've adjusted the baseline of | |
| 878 a short glyph, and there's a tall one next to it), then take the ascent and | |
| 879 descent for the line individually from the largest of the explicitly set | |
| 880 ascent/descent, and the rescaled ascent/descent of the default font, scaled | |
| 881 such that the largest glyph will fit. | |
| 882 | |
| 883 This means that if you have a short glyph (but taller than the default | |
| 884 font's descent) forced right under the baseline, and a really tall | |
| 885 automatically positioned glyph, that the descent for the line is just big | |
| 886 enough for the manually positioned short glyph, and the tall one uses as | |
| 887 much of that space as the default font would were it as tall as the tall | |
| 888 glyph; but that the ascent is big enough for the tall glyph to fit. | |
| 889 | |
| 890 This behaviour means that under no circumstances will changing the baseline | |
| 891 of a short glyph cause a tall glyph to move around; nor will it move the | |
| 892 textual baseline more than necessary. (Changing a tall glyph's baseline | |
| 893 might move the text's baseline arbitrarily, of course.) */ | |
| 894 | |
| 895 static void | |
| 896 calculate_baseline (pos_data *data) | |
| 897 { | |
| 898 /* Blank line: baseline is default font's baseline. */ | |
| 899 | |
| 900 if (!data->new_ascent && !data->new_descent) | |
| 901 { | |
| 902 /* We've got a blank line so initialize these values from the default | |
| 4187 | 903 face. */ |
| 819 | 904 default_face_font_info (data->window, &data->new_ascent, |
| 905 &data->new_descent, 0, 0, 0); | |
| 906 } | |
| 4187 | 907 |
| 819 | 908 /* No automatically positioned glyphs? Return at once. */ |
| 909 if (!data->need_baseline_computation) | |
| 910 return; | |
| 911 | |
| 912 /* Is the tallest glyph on the line automatically positioned? | |
| 913 If it's manually positioned, or it's automatically positioned | |
| 914 and there's enough room for it anyway, we need do no more work. */ | |
| 915 if (data->max_pixmap_height > data->new_ascent + data->new_descent) | |
| 916 { | |
| 917 int default_font_ascent, default_font_descent, default_font_height; | |
| 918 int scaled_default_font_ascent, scaled_default_font_descent; | |
| 4187 | 919 |
| 819 | 920 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
|
921 &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
|
922 0); |
| 819 | 923 |
| 924 scaled_default_font_ascent = data->max_pixmap_height * | |
| 925 default_font_ascent / default_font_height; | |
| 926 | |
| 927 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent); | |
| 928 | |
| 929 /* The ascent may have expanded now. Do we still need to grow the descent, | |
| 4187 | 930 or are things big enough? |
| 931 | |
| 932 The +1 caters for the baseline row itself. */ | |
| 819 | 933 if (data->max_pixmap_height > data->new_ascent + data->new_descent) |
| 4187 | 934 { |
| 935 scaled_default_font_descent = (data->max_pixmap_height * | |
| 819 | 936 default_font_descent / default_font_height) + 1; |
| 937 | |
| 4187 | 938 data->new_descent = max (data->new_descent, scaled_default_font_descent); |
| 939 } | |
| 819 | 940 } |
| 941 } | |
| 942 | |
| 428 | 943 /* Given a display line and a starting position, ensure that the |
| 944 contents of the display line accurately represent the visual | |
| 945 representation of the buffer contents starting from the given | |
| 946 position when displayed in the given window. The display line ends | |
| 947 when the contents of the line reach the right boundary of the given | |
| 948 window. */ | |
| 949 | |
| 665 | 950 static Charbpos |
| 428 | 951 generate_display_line (struct window *w, struct display_line *dl, int bounds, |
| 665 | 952 Charbpos start_pos, prop_block_dynarr **prop, |
| 428 | 953 int type) |
| 954 { | |
| 826 | 955 Charbpos ret_charpos; |
| 428 | 956 int overlay_width; |
| 957 struct buffer *b = XBUFFER (WINDOW_BUFFER (w)); | |
| 958 | |
| 959 /* If our caller hasn't already set the boundaries, then do so now. */ | |
| 960 if (!bounds) | |
| 961 dl->bounds = calculate_display_line_boundaries (w, 0); | |
| 962 | |
| 963 /* Reset what this line is using. */ | |
| 964 if (dl->display_blocks) | |
| 965 Dynarr_reset (dl->display_blocks); | |
| 966 if (dl->left_glyphs) | |
| 967 { | |
| 968 Dynarr_free (dl->left_glyphs); | |
| 969 dl->left_glyphs = 0; | |
| 970 } | |
| 971 if (dl->right_glyphs) | |
| 972 { | |
| 973 Dynarr_free (dl->right_glyphs); | |
| 974 dl->right_glyphs = 0; | |
| 975 } | |
| 976 | |
| 977 /* We aren't generating a modeline at the moment. */ | |
| 978 dl->modeline = 0; | |
| 979 | |
| 980 /* Create a display block for the text region of the line. */ | |
| 981 { | |
| 982 /* #### urk urk urk!!! Chuck fix this shit! */ | |
| 665 | 983 Bytebpos hacked_up_bytebpos = |
| 984 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos), | |
| 428 | 985 prop, type); |
| 826 | 986 if (hacked_up_bytebpos > BYTE_BUF_ZV (b)) |
| 987 ret_charpos = BUF_ZV (b) + 1; | |
| 428 | 988 else |
| 826 | 989 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos); |
| 428 | 990 } |
| 826 | 991 dl->charpos = start_pos; |
| 992 if (dl->end_charpos < dl->charpos) | |
| 993 dl->end_charpos = dl->charpos; | |
| 428 | 994 |
| 995 if (MARKERP (Voverlay_arrow_position) | |
| 996 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position)) | |
| 997 && start_pos == marker_position (Voverlay_arrow_position) | |
| 998 && (STRINGP (Voverlay_arrow_string) | |
| 999 || GLYPHP (Voverlay_arrow_string))) | |
| 1000 { | |
| 1001 overlay_width = create_overlay_glyph_block (w, dl); | |
| 1002 } | |
| 1003 else | |
| 1004 overlay_width = 0; | |
| 1005 | |
| 1006 /* If there are left glyphs associated with any character in the | |
| 1007 text block, then create a display block to handle them. */ | |
| 1008 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs)) | |
| 1009 create_left_glyph_block (w, dl, overlay_width); | |
| 1010 | |
| 1011 /* If there are right glyphs associated with any character in the | |
| 1012 text block, then create a display block to handle them. */ | |
| 1013 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs)) | |
| 1014 create_right_glyph_block (w, dl); | |
| 1015 | |
| 1016 /* In the future additional types of display blocks may be generated | |
| 1017 here. */ | |
| 1018 | |
| 826 | 1019 w->last_redisplay_pos = ret_charpos; |
| 1020 | |
| 1021 return ret_charpos; | |
| 428 | 1022 } |
| 1023 | |
| 1024 /* Adds an hscroll glyph to a display block. If this is called, then | |
| 1025 the block had better be empty. | |
| 1026 | |
| 1027 Yes, there are multiple places where this function is called but | |
| 1028 that is the way it has to be. Each calling function has to deal | |
| 826 | 1029 with byte_start_col_enabled a little differently depending on the |
| 428 | 1030 object being worked with. */ |
| 1031 | |
| 1032 static prop_block_dynarr * | |
| 1033 add_hscroll_rune (pos_data *data) | |
| 1034 { | |
| 1035 struct glyph_block gb; | |
| 1036 prop_block_dynarr *retval; | |
| 826 | 1037 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos; |
| 647 | 1038 int old_cursor_type = data->cursor_type; |
| 826 | 1039 Bytebpos byte_old_charpos = data->byte_charpos; |
| 428 | 1040 |
| 1041 if (data->cursor_type == CURSOR_ON | |
| 826 | 1042 && data->byte_cursor_charpos >= data->byte_start_col_enabled |
| 1043 && data->byte_cursor_charpos <= data->byte_charpos) | |
| 1044 { | |
| 1045 data->byte_cursor_charpos = data->byte_start_col_enabled; | |
| 428 | 1046 } |
| 1047 else | |
| 1048 { | |
| 1049 data->cursor_type = NO_CURSOR; | |
| 1050 } | |
| 1051 | |
| 826 | 1052 data->byte_endpos = data->byte_charpos; |
| 1053 data->byte_charpos = data->byte_start_col_enabled; | |
| 428 | 1054 |
| 1055 gb.extent = Qnil; | |
| 1056 gb.glyph = Vhscroll_glyph; | |
| 1057 { | |
| 1058 int oldpixpos = data->pixpos; | |
| 442 | 1059 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, |
| 428 | 1060 GLYPH_CACHEL (XWINDOW (data->window), |
| 1061 HSCROLL_GLYPH_INDEX)); | |
| 1062 data->hscroll_glyph_width_adjust = | |
| 1063 data->pixpos - oldpixpos - space_width (XWINDOW (data->window)); | |
| 1064 } | |
| 826 | 1065 data->byte_endpos = 0; |
| 1066 data->byte_cursor_charpos = byte_old_cursor_charpos; | |
| 428 | 1067 data->cursor_type = old_cursor_type; |
| 826 | 1068 data->byte_charpos = byte_old_charpos; |
| 1069 | |
| 1070 data->byte_start_col_enabled = 0; | |
| 428 | 1071 return retval; |
| 1072 } | |
| 1073 | |
| 793 | 1074 /* Adds a character rune to a display block. If there is not enough room |
| 1075 to fit the rune on the display block (as determined by the MAX_PIXPOS) | |
| 1076 then it adds nothing and returns ADD_FAILED. If | |
| 1077 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height | |
| 867 | 1078 to affect the total line height. (See add_ibyte_string_runes()). */ |
| 428 | 1079 |
| 1080 static prop_block_dynarr * | |
| 867 | 1081 add_ichar_rune_1 (pos_data *data, int no_contribute_to_line_height) |
| 428 | 1082 { |
| 1083 struct rune rb, *crb; | |
| 1084 int width, local; | |
| 1085 | |
| 1086 if (data->start_col) | |
| 1087 { | |
| 1088 data->start_col--; | |
| 1089 | |
| 1090 if (data->start_col) | |
| 1091 return NULL; | |
| 1092 } | |
| 1093 | |
| 826 | 1094 if (data->byte_start_col_enabled) |
| 428 | 1095 { |
| 1096 return add_hscroll_rune (data); | |
| 1097 } | |
| 1098 | |
| 1099 if (data->ch == '\n') | |
| 1100 { | |
| 1101 data->font_is_bogus = 0; | |
| 1102 /* Cheesy end-of-line pseudo-character. */ | |
| 1103 width = data->blank_width; | |
| 1104 } | |
| 1105 else | |
| 1106 { | |
| 867 | 1107 Lisp_Object charset = ichar_charset (data->ch); |
| 428 | 1108 if (!EQ (charset, data->last_charset) || |
| 1109 data->findex != data->last_findex) | |
| 1110 { | |
| 1111 /* OK, we need to do things the hard way. */ | |
| 1112 struct window *w = XWINDOW (data->window); | |
| 1113 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex); | |
| 1114 Lisp_Object font_instance = | |
| 1115 ensure_face_cachel_contains_charset (cachel, data->window, | |
| 1116 charset); | |
| 440 | 1117 Lisp_Font_Instance *fi; |
| 428 | 1118 |
| 1119 if (EQ (font_instance, Vthe_null_font_instance)) | |
| 1120 { | |
| 1121 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii); | |
| 1122 data->font_is_bogus = 1; | |
| 1123 } | |
| 1124 else | |
| 1125 data->font_is_bogus = 0; | |
| 1126 | |
| 1127 fi = XFONT_INSTANCE (font_instance); | |
| 771 | 1128 if (!fi->proportional_p || data->font_is_bogus) |
| 1129 { | |
| 867 | 1130 Ichar ch = data->font_is_bogus ? '~' : data->ch; |
| 771 | 1131 |
| 1132 data->last_char_width = | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1133 redisplay_window_text_width_ichar_string |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1134 (XWINDOW (data->window), data->findex, &ch, 1); |
| 771 | 1135 } |
| 428 | 1136 else |
| 1137 data->last_char_width = -1; | |
| 819 | 1138 |
| 793 | 1139 if (!no_contribute_to_line_height) |
| 1140 { | |
| 1141 data->new_ascent = max (data->new_ascent, (int) fi->ascent); | |
| 1142 data->new_descent = max (data->new_descent, (int) fi->descent); | |
| 1143 } | |
| 819 | 1144 |
| 428 | 1145 data->last_charset = charset; |
| 1146 data->last_findex = data->findex; | |
| 1147 } | |
| 1148 | |
| 1149 width = data->last_char_width; | |
| 771 | 1150 if (width < 0) /* proportional fonts */ |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1151 width = redisplay_window_text_width_ichar_string |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
1152 (XWINDOW (data->window), data->findex, &data->ch, 1); |
| 428 | 1153 } |
| 1154 | |
| 1155 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos)) | |
| 1156 { | |
| 1157 return ADD_FAILED; | |
| 1158 } | |
| 1159 | |
| 1160 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes)) | |
| 1161 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
1162 crb = Dynarr_past_lastp (data->db->runes); |
| 428 | 1163 local = 0; |
| 1164 } | |
| 1165 else | |
| 1166 { | |
| 1167 crb = &rb; | |
| 1168 local = 1; | |
| 1169 } | |
| 1170 | |
| 1171 crb->findex = data->findex; | |
| 1172 crb->xpos = data->pixpos; | |
| 1173 crb->width = width; | |
| 826 | 1174 if (data->byte_charpos) |
| 428 | 1175 { |
| 1176 if (NILP (data->string)) | |
| 826 | 1177 crb->charpos = |
| 793 | 1178 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER |
| 1179 (XWINDOW (data->window))), | |
| 826 | 1180 data->byte_charpos); |
| 428 | 1181 else |
| 826 | 1182 crb->charpos = |
| 1183 string_index_byte_to_char (data->string, data->byte_charpos); | |
| 428 | 1184 } |
| 1185 else if (data->is_modeline) | |
| 826 | 1186 crb->charpos = data->modeline_charpos; |
| 428 | 1187 else |
| 442 | 1188 /* Text but not in buffer */ |
| 826 | 1189 crb->charpos = 0; |
| 428 | 1190 crb->type = RUNE_CHAR; |
| 1191 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch; | |
| 1192 crb->endpos = 0; | |
| 1193 | |
| 1194 if (data->cursor_type == CURSOR_ON) | |
| 1195 { | |
| 826 | 1196 if (data->byte_charpos == data->byte_cursor_charpos) |
| 428 | 1197 { |
| 1198 crb->cursor_type = CURSOR_ON; | |
| 1199 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1200 } | |
| 1201 else | |
| 1202 crb->cursor_type = CURSOR_OFF; | |
| 1203 } | |
| 1204 else if (data->cursor_type == NEXT_CURSOR) | |
| 1205 { | |
| 1206 crb->cursor_type = CURSOR_ON; | |
| 1207 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1208 data->cursor_type = NO_CURSOR; | |
| 1209 } | |
| 1210 else if (data->cursor_type == IGNORE_CURSOR) | |
| 1211 crb->cursor_type = IGNORE_CURSOR; | |
| 1212 else | |
| 1213 crb->cursor_type = CURSOR_OFF; | |
| 1214 | |
| 1215 if (local) | |
| 1216 Dynarr_add (data->db->runes, *crb); | |
| 1217 else | |
| 5038 | 1218 Dynarr_incrementr (data->db->runes); |
| 428 | 1219 |
| 1220 data->pixpos += width; | |
| 1221 | |
| 1222 return NULL; | |
| 1223 } | |
| 1224 | |
| 793 | 1225 static prop_block_dynarr * |
| 867 | 1226 add_ichar_rune (pos_data *data) |
| 1227 { | |
| 1228 return add_ichar_rune_1 (data, 0); | |
| 1229 } | |
| 1230 | |
| 1231 /* Given a string C_STRING of length C_LENGTH, call add_ichar_rune for | |
| 793 | 1232 each character in the string. Propagate any left-over data unless |
| 1233 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't | |
| 1234 allow this character to increase the total height of the line. (This is | |
| 1235 used when the character is part of a text glyph. In that case, the | |
| 1236 glyph code itself adjusts the line height as necessary, depending on | |
| 1237 whether glyph-contrib-p is true.) */ | |
| 428 | 1238 |
| 1239 static prop_block_dynarr * | |
| 867 | 1240 add_ibyte_string_runes (pos_data *data, Ibyte *c_string, |
| 793 | 1241 Bytecount c_length, int no_prop, |
| 1242 int no_contribute_to_line_height) | |
| 428 | 1243 { |
| 867 | 1244 Ibyte *pos, *end = c_string + c_length; |
| 428 | 1245 prop_block_dynarr *prop; |
| 1246 | |
| 1247 /* #### This function is too simplistic. It needs to do the same | |
| 1248 sort of character interpretation (display-table lookup, | |
| 1249 ctl-arrow checking), etc. that create_text_block() does. | |
| 1250 The functionality to do this in that routine needs to be | |
| 1251 modularized. */ | |
| 1252 | |
| 1253 for (pos = c_string; pos < end;) | |
| 1254 { | |
| 867 | 1255 Ibyte *old_pos = pos; |
| 1256 | |
| 1257 data->ch = itext_ichar (pos); | |
| 1258 | |
| 1259 prop = add_ichar_rune_1 (data, no_contribute_to_line_height); | |
| 428 | 1260 |
| 1261 if (prop) | |
| 1262 { | |
| 1263 if (no_prop) | |
| 1264 return ADD_FAILED; | |
| 1265 else | |
| 1266 { | |
| 1267 struct prop_block pb; | |
| 1268 Bytecount len = end - pos; | |
| 1269 prop = Dynarr_new (prop_block); | |
| 1270 | |
| 1271 pb.type = PROP_STRING; | |
| 867 | 1272 pb.data.p_string.str = xnew_array (Ibyte, len); |
| 4970 | 1273 qxestrncpy (pb.data.p_string.str, pos, len); |
| 428 | 1274 pb.data.p_string.len = len; |
| 1275 | |
| 1276 Dynarr_add (prop, pb); | |
| 1277 return prop; | |
| 1278 } | |
| 1279 } | |
| 867 | 1280 INC_IBYTEPTR (pos); |
| 428 | 1281 assert (pos <= end); |
| 464 | 1282 /* #### Duplicate code from add_string_to_fstring_db_runes |
| 1283 should we do more?*/ | |
| 1284 data->bytepos += pos - old_pos; | |
| 428 | 1285 } |
| 1286 | |
| 1287 return NULL; | |
| 1288 } | |
| 1289 | |
| 1290 /* Add a single rune of the specified width. The area covered by this | |
| 1291 rune will be displayed in the foreground color of the associated | |
| 1292 face. */ | |
| 1293 | |
| 1294 static prop_block_dynarr * | |
| 1295 add_blank_rune (pos_data *data, struct window *w, int char_tab_width) | |
| 1296 { | |
| 1297 struct rune rb; | |
| 1298 | |
| 1299 /* If data->start_col is not 0 then this call to add_blank_rune must have | |
| 1300 been to add it as a tab. */ | |
| 1301 if (data->start_col) | |
| 1302 { | |
| 1303 /* assert (w != NULL) */ | |
| 1304 prop_block_dynarr *retval; | |
| 1305 | |
| 1306 /* If we have still not fully scrolled horizontally, subtract | |
| 4187 | 1307 the width of this tab and return. */ |
| 428 | 1308 if (char_tab_width < data->start_col) |
| 1309 { | |
| 1310 data->start_col -= char_tab_width; | |
| 1311 return NULL; | |
| 1312 } | |
| 1313 else if (char_tab_width == data->start_col) | |
| 1314 data->blank_width = 0; | |
| 1315 else | |
| 1316 { | |
| 1317 int spcwid = space_width (w); | |
| 1318 | |
| 1319 if (spcwid >= data->blank_width) | |
| 1320 data->blank_width = 0; | |
| 1321 else | |
| 1322 data->blank_width -= spcwid; | |
| 1323 } | |
| 1324 | |
| 1325 data->start_col = 0; | |
| 1326 retval = add_hscroll_rune (data); | |
| 1327 | |
| 1328 /* Could be caused by the handling of the hscroll rune. */ | |
| 1329 if (retval != NULL || !data->blank_width) | |
| 1330 return retval; | |
| 1331 } | |
| 1332 | |
| 1333 /* Blank runes are always calculated to fit. */ | |
| 1334 assert (data->pixpos + data->blank_width <= data->max_pixpos); | |
| 1335 | |
| 1336 rb.findex = data->findex; | |
| 1337 rb.xpos = data->pixpos; | |
| 1338 rb.width = data->blank_width; | |
| 826 | 1339 if (data->byte_charpos) |
| 1340 rb.charpos = | |
| 665 | 1341 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))), |
| 826 | 1342 data->byte_charpos); |
| 428 | 1343 else |
| 1344 /* #### and this is really correct too? */ | |
| 826 | 1345 rb.charpos = 0; |
| 428 | 1346 rb.endpos = 0; |
| 1347 rb.type = RUNE_BLANK; | |
| 1348 | |
| 1349 if (data->cursor_type == CURSOR_ON) | |
| 1350 { | |
| 826 | 1351 if (data->byte_charpos == data->byte_cursor_charpos) |
| 428 | 1352 { |
| 1353 rb.cursor_type = CURSOR_ON; | |
| 1354 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1355 } | |
| 1356 else | |
| 1357 rb.cursor_type = CURSOR_OFF; | |
| 1358 } | |
| 1359 else if (data->cursor_type == NEXT_CURSOR) | |
| 1360 { | |
| 1361 rb.cursor_type = CURSOR_ON; | |
| 1362 data->cursor_x = Dynarr_length (data->db->runes); | |
| 1363 data->cursor_type = NO_CURSOR; | |
| 1364 } | |
| 1365 else | |
| 1366 rb.cursor_type = CURSOR_OFF; | |
| 1367 | |
| 1368 Dynarr_add (data->db->runes, rb); | |
| 1369 data->pixpos += data->blank_width; | |
| 1370 | |
| 1371 return NULL; | |
| 1372 } | |
| 1373 | |
| 1374 /* Add runes representing a character in octal. */ | |
| 1375 | |
| 1376 #define ADD_NEXT_OCTAL_RUNE_CHAR do \ | |
| 1377 { \ | |
| 867 | 1378 if (add_failed || (add_failed = add_ichar_rune (data))) \ |
| 428 | 1379 { \ |
| 1380 struct prop_block pb; \ | |
| 1381 if (!prop) \ | |
| 1382 prop = Dynarr_new (prop_block); \ | |
| 1383 \ | |
| 1384 pb.type = PROP_CHAR; \ | |
| 1385 pb.data.p_char.ch = data->ch; \ | |
| 1386 pb.data.p_char.cursor_type = data->cursor_type; \ | |
| 1387 Dynarr_add (prop, pb); \ | |
| 1388 } \ | |
| 1389 } while (0) | |
| 1390 | |
| 1391 static prop_block_dynarr * | |
| 1392 add_octal_runes (pos_data *data) | |
| 1393 { | |
| 819 | 1394 prop_block_dynarr *add_failed, *prop = 0; |
| 867 | 1395 Ichar orig_char = data->ch; |
| 647 | 1396 int orig_cursor_type = data->cursor_type; |
| 428 | 1397 |
| 1398 /* Initialize */ | |
| 1399 add_failed = NULL; | |
| 1400 | |
| 1401 if (data->start_col) | |
| 1402 data->start_col--; | |
| 1403 | |
| 1404 if (!data->start_col) | |
| 1405 { | |
| 826 | 1406 if (data->byte_start_col_enabled) |
| 428 | 1407 { |
| 1408 add_failed = add_hscroll_rune (data); | |
| 1409 } | |
| 1410 else | |
| 1411 { | |
| 1412 struct glyph_block gb; | |
| 1413 struct window *w = XWINDOW (data->window); | |
| 1414 | |
| 1415 gb.extent = Qnil; | |
| 1416 gb.glyph = Voctal_escape_glyph; | |
| 1417 add_failed = | |
| 1418 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1, | |
| 1419 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX)); | |
| 1420 } | |
| 1421 } | |
| 1422 | |
| 1423 /* We only propagate information if the glyph was partially | |
| 1424 added. */ | |
| 1425 if (add_failed) | |
| 1426 return add_failed; | |
| 1427 | |
| 1428 data->cursor_type = IGNORE_CURSOR; | |
| 1429 | |
| 1430 if (data->ch >= 0x100) | |
| 1431 { | |
| 1432 /* If the character is an extended Mule character, it could have | |
| 3498 | 1433 up to 21 bits. For the moment, we treat it as a seven-digit |
| 428 | 1434 octal number. This is not that pretty, but whatever. */ |
| 1435 data->ch = (7 & (orig_char >> 18)) + '0'; | |
| 1436 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1437 | |
| 1438 data->ch = (7 & (orig_char >> 15)) + '0'; | |
| 1439 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1440 | |
| 1441 data->ch = (7 & (orig_char >> 12)) + '0'; | |
| 1442 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1443 | |
| 1444 data->ch = (7 & (orig_char >> 9)) + '0'; | |
| 1445 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1446 } | |
| 1447 | |
| 1448 data->ch = (7 & (orig_char >> 6)) + '0'; | |
| 1449 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1450 | |
| 1451 data->ch = (7 & (orig_char >> 3)) + '0'; | |
| 1452 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1453 | |
| 1454 data->ch = (7 & orig_char) + '0'; | |
| 1455 ADD_NEXT_OCTAL_RUNE_CHAR; | |
| 1456 | |
| 1457 data->cursor_type = orig_cursor_type; | |
| 819 | 1458 return NULL; |
| 428 | 1459 } |
| 1460 | |
| 1461 #undef ADD_NEXT_OCTAL_RUNE_CHAR | |
| 1462 | |
| 1463 /* Add runes representing a control character to a display block. */ | |
| 1464 | |
| 1465 static prop_block_dynarr * | |
| 1466 add_control_char_runes (pos_data *data, struct buffer *b) | |
| 1467 { | |
| 1468 if (!NILP (b->ctl_arrow)) | |
| 1469 { | |
| 1470 prop_block_dynarr *prop; | |
| 867 | 1471 Ichar orig_char = data->ch; |
| 647 | 1472 int old_cursor_type = data->cursor_type; |
| 428 | 1473 |
| 1474 /* Initialize */ | |
| 1475 prop = NULL; | |
| 1476 | |
| 1477 if (data->start_col) | |
| 1478 data->start_col--; | |
| 1479 | |
| 1480 if (!data->start_col) | |
| 1481 { | |
| 826 | 1482 if (data->byte_start_col_enabled) |
| 428 | 1483 { |
| 1484 prop_block_dynarr *retval; | |
| 1485 | |
| 1486 retval = add_hscroll_rune (data); | |
| 1487 if (retval) | |
| 1488 return retval; | |
| 1489 } | |
| 1490 else | |
| 1491 { | |
| 1492 struct glyph_block gb; | |
| 1493 struct window *w = XWINDOW (data->window); | |
| 1494 | |
| 1495 gb.extent = Qnil; | |
| 1496 gb.glyph = Vcontrol_arrow_glyph; | |
| 1497 | |
| 1498 /* We only propagate information if the glyph was partially | |
| 1499 added. */ | |
| 1500 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1, | |
| 1501 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX))) | |
| 1502 return ADD_FAILED; | |
| 1503 } | |
| 1504 } | |
| 1505 | |
| 1506 if (orig_char == 0177) | |
| 1507 data->ch = '?'; | |
| 1508 else | |
| 1509 data->ch = orig_char ^ 0100; | |
| 1510 data->cursor_type = IGNORE_CURSOR; | |
| 1511 | |
| 867 | 1512 if (add_ichar_rune (data)) |
| 428 | 1513 { |
| 1514 struct prop_block pb; | |
| 1515 if (!prop) | |
| 1516 prop = Dynarr_new (prop_block); | |
| 1517 | |
| 1518 pb.type = PROP_CHAR; | |
| 1519 pb.data.p_char.ch = data->ch; | |
| 1520 pb.data.p_char.cursor_type = data->cursor_type; | |
| 1521 Dynarr_add (prop, pb); | |
| 1522 } | |
| 1523 | |
| 1524 data->cursor_type = old_cursor_type; | |
| 1525 return prop; | |
| 1526 } | |
| 1527 else | |
| 1528 { | |
| 1529 return add_octal_runes (data); | |
| 1530 } | |
| 1531 } | |
| 1532 | |
| 1533 static prop_block_dynarr * | |
| 1534 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry) | |
| 1535 { | |
| 1536 prop_block_dynarr *prop = NULL; | |
| 1537 | |
| 1538 if (STRINGP (entry)) | |
| 1539 { | |
| 867 | 1540 prop = add_ibyte_string_runes (data, |
| 428 | 1541 XSTRING_DATA (entry), |
| 1542 XSTRING_LENGTH (entry), | |
| 793 | 1543 0, 0); |
| 428 | 1544 } |
| 1545 else if (GLYPHP (entry)) | |
| 1546 { | |
| 1547 if (data->start_col) | |
| 1548 data->start_col--; | |
| 1549 | |
| 826 | 1550 if (!data->start_col && data->byte_start_col_enabled) |
| 428 | 1551 { |
| 1552 prop = add_hscroll_rune (data); | |
| 1553 } | |
| 1554 else | |
| 1555 { | |
| 1556 struct glyph_block gb; | |
| 1557 | |
| 1558 gb.glyph = entry; | |
| 1559 gb.extent = Qnil; | |
| 1560 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0); | |
| 1561 } | |
| 1562 } | |
| 1563 else if (CHAR_OR_CHAR_INTP (entry)) | |
| 1564 { | |
| 1565 data->ch = XCHAR_OR_CHAR_INT (entry); | |
| 867 | 1566 prop = add_ichar_rune (data); |
| 428 | 1567 } |
| 1568 else if (CONSP (entry)) | |
| 1569 { | |
| 1570 if (EQ (XCAR (entry), Qformat) | |
| 1571 && CONSP (XCDR (entry)) | |
| 1572 && STRINGP (XCAR (XCDR (entry)))) | |
| 1573 { | |
| 1574 Lisp_Object format = XCAR (XCDR (entry)); | |
| 665 | 1575 Bytebpos len = XSTRING_LENGTH (format); |
| 867 | 1576 Ibyte *src = XSTRING_DATA (format), *end = src + len; |
| 2367 | 1577 Ibyte *result = alloca_ibytes (len); |
| 867 | 1578 Ibyte *dst = result; |
| 428 | 1579 |
| 1580 while (src < end) | |
| 1581 { | |
| 867 | 1582 Ichar c = itext_ichar (src); |
| 1583 INC_IBYTEPTR (src); | |
| 428 | 1584 if (c != '%' || src == end) |
| 867 | 1585 dst += set_itext_ichar (dst, c); |
| 428 | 1586 else |
| 1587 { | |
| 867 | 1588 c = itext_ichar (src); |
| 1589 INC_IBYTEPTR (src); | |
| 428 | 1590 switch (c) |
| 1591 { | |
| 1592 /*case 'x': | |
| 1593 dst += long_to_string_base ((char *)dst, data->ch, 16); | |
| 1594 break;*/ | |
| 1595 case '%': | |
| 867 | 1596 dst += set_itext_ichar (dst, '%'); |
| 428 | 1597 break; |
| 442 | 1598 /* #### unimplemented */ |
| 428 | 1599 } |
| 1600 } | |
| 1601 } | |
| 867 | 1602 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0); |
| 428 | 1603 } |
| 1604 } | |
| 1605 | |
| 1606 /* Else blow it off because someone added a bad entry and we don't | |
| 1607 have any safe way of signaling an error. */ | |
| 1608 return prop; | |
| 1609 } | |
| 1610 | |
| 1611 /* Given a display table entry, call the appropriate functions to | |
| 1612 display each element of the entry. */ | |
| 1613 | |
| 1614 static prop_block_dynarr * | |
| 1615 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry) | |
| 1616 { | |
| 1617 prop_block_dynarr *prop = NULL; | |
| 1618 if (VECTORP (entry)) | |
| 1619 { | |
| 440 | 1620 Lisp_Vector *de = XVECTOR (entry); |
| 428 | 1621 EMACS_INT len = vector_length (de); |
| 1622 int elt; | |
| 1623 | |
| 1624 for (elt = 0; elt < len; elt++) | |
| 1625 { | |
| 1626 if (NILP (vector_data (de)[elt])) | |
| 1627 continue; | |
| 1628 else | |
| 1629 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]); | |
| 1630 /* Else blow it off because someone added a bad entry and we | |
| 1631 don't have any safe way of signaling an error. Hey, this | |
| 1632 comment sounds familiar. */ | |
| 1633 | |
| 1634 /* #### Still need to add any remaining elements to the | |
| 4187 | 1635 propagation information. */ |
| 428 | 1636 if (prop) |
| 1637 return prop; | |
| 1638 } | |
| 1639 } | |
| 1640 else | |
| 1641 prop = add_disp_table_entry_runes_1 (data, entry); | |
| 1642 return prop; | |
| 1643 } | |
| 1644 | |
| 1645 /* Add runes which were propagated from the previous line. */ | |
| 1646 | |
| 1647 static prop_block_dynarr * | |
| 1648 add_propagation_runes (prop_block_dynarr **prop, pos_data *data) | |
| 1649 { | |
| 1650 /* #### Remember to handle start_col parameter of data when the rest of | |
| 1651 this is finished. */ | |
| 1652 /* #### Chuck -- I've redone this function a bit. It looked like the | |
| 1653 case of not all the propagation blocks being added was not handled | |
| 1654 well. */ | |
| 1655 /* #### Chuck -- I also think the double indirection of PROP is kind | |
| 1656 of bogus. A cleaner solution is just to check for | |
| 1657 Dynarr_length (prop) > 0. */ | |
| 1658 /* #### This function also doesn't even pay attention to ADD_FAILED! | |
| 1659 This is seriously fucked! Seven ####'s in 130 lines -- is that a | |
| 1660 record? */ | |
| 1661 int elt; | |
| 1662 prop_block_dynarr *add_failed; | |
| 826 | 1663 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos; |
| 647 | 1664 int old_cursor_type = data->cursor_type; |
| 428 | 1665 |
| 1666 for (elt = 0; elt < Dynarr_length (*prop); elt++) | |
| 1667 { | |
| 1668 struct prop_block *pb = Dynarr_atp (*prop, elt); | |
| 1669 | |
| 1670 switch (pb->type) | |
| 1671 { | |
| 1672 case PROP_CHAR: | |
| 1673 data->ch = pb->data.p_char.ch; | |
| 826 | 1674 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos; |
| 428 | 1675 data->cursor_type = pb->data.p_char.cursor_type; |
| 867 | 1676 add_failed = add_ichar_rune (data); |
| 428 | 1677 |
| 1678 if (add_failed) | |
| 1679 goto oops_no_more_space; | |
| 1680 break; | |
| 1681 case PROP_STRING: | |
| 1682 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
|
1683 { |
|
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
|
1684 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
|
1685 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
|
1686 } |
| 428 | 1687 /* #### bogus bogus -- this doesn't do anything! |
| 867 | 1688 Should probably call add_ibyte_string_runes(), |
| 428 | 1689 once that function is fixed. */ |
| 1690 break; | |
| 1691 case PROP_MINIBUF_PROMPT: | |
| 1692 { | |
| 1693 face_index old_findex = data->findex; | |
| 826 | 1694 Bytebpos byte_old_charpos = data->byte_charpos; |
| 428 | 1695 |
| 1696 data->findex = DEFAULT_INDEX; | |
| 826 | 1697 data->byte_charpos = 0; |
| 428 | 1698 data->cursor_type = NO_CURSOR; |
| 1699 | |
| 1700 while (pb->data.p_string.len > 0) | |
| 1701 { | |
| 867 | 1702 data->ch = itext_ichar (pb->data.p_string.str); |
| 1703 add_failed = add_ichar_rune (data); | |
| 428 | 1704 |
| 1705 if (add_failed) | |
| 1706 { | |
| 1707 data->findex = old_findex; | |
| 826 | 1708 data->byte_charpos = byte_old_charpos; |
| 428 | 1709 goto oops_no_more_space; |
| 1710 } | |
| 1711 else | |
| 1712 { | |
| 1713 /* Complicated equivalent of ptr++, len-- */ | |
| 867 | 1714 Ibyte *oldpos = pb->data.p_string.str; |
| 1715 INC_IBYTEPTR (pb->data.p_string.str); | |
| 428 | 1716 pb->data.p_string.len -= pb->data.p_string.str - oldpos; |
| 1717 } | |
| 1718 } | |
| 1719 | |
| 1720 data->findex = old_findex; | |
| 1721 /* ##### FIXME FIXME FIXME -- Upon successful return from | |
| 826 | 1722 this function, data->byte_charpos is automatically incremented. |
| 428 | 1723 However, we don't want that to happen if we were adding |
| 1724 the minibuffer prompt. */ | |
| 1725 { | |
| 1726 struct buffer *buf = | |
| 1727 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))); | |
| 1728 /* #### Chuck fix this shit or I'm gonna scream! */ | |
| 826 | 1729 if (byte_old_charpos > BYTE_BUF_BEGV (buf)) |
| 4187 | 1730 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos); |
| 1731 else | |
| 428 | 1732 /* #### is this correct? Does anyone know? |
| 1733 Does anyone care? Is this a cheesy hack or what? */ | |
| 4187 | 1734 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1; |
| 428 | 1735 } |
| 1736 } | |
| 1737 break; | |
| 1738 case PROP_BLANK: | |
| 1739 { | |
| 1740 /* #### I think it's unnecessary and misleading to preserve | |
| 1741 the blank_width, as it implies that the value carries | |
| 1742 over from one rune to the next, which is wrong. */ | |
| 1743 int old_width = data->blank_width; | |
| 1744 face_index old_findex = data->findex; | |
| 1745 | |
| 1746 data->findex = pb->data.p_blank.findex; | |
| 1747 data->blank_width = pb->data.p_blank.width; | |
| 826 | 1748 data->byte_cursor_charpos = 0; |
| 428 | 1749 data->cursor_type = IGNORE_CURSOR; |
| 1750 | |
| 1751 if (data->pixpos + data->blank_width > data->max_pixpos) | |
| 1752 data->blank_width = data->max_pixpos - data->pixpos; | |
| 1753 | |
| 1754 /* We pass a bogus value of char_tab_width. It shouldn't | |
| 4187 | 1755 matter because unless something is really screwed up |
| 1756 this call won't cause that arg to be used. */ | |
| 428 | 1757 add_failed = add_blank_rune (data, XWINDOW (data->window), 0); |
| 1758 | |
| 1759 /* This can happen in the case where we have a tab which | |
| 4187 | 1760 is wider than the window. */ |
| 428 | 1761 if (data->blank_width != pb->data.p_blank.width) |
| 1762 { | |
| 1763 pb->data.p_blank.width -= data->blank_width; | |
| 1764 add_failed = ADD_FAILED; | |
| 1765 } | |
| 1766 | |
| 1767 data->findex = old_findex; | |
| 1768 data->blank_width = old_width; | |
| 1769 | |
| 1770 if (add_failed) | |
| 1771 goto oops_no_more_space; | |
| 1772 } | |
| 1773 break; | |
| 1774 default: | |
| 2500 | 1775 ABORT (); |
| 428 | 1776 } |
| 1777 } | |
| 1778 | |
| 1779 oops_no_more_space: | |
| 1780 | |
| 826 | 1781 data->byte_cursor_charpos = byte_old_cursor_charpos; |
| 428 | 1782 data->cursor_type = old_cursor_type; |
| 1783 if (elt < Dynarr_length (*prop)) | |
| 1784 { | |
| 1785 Dynarr_delete_many (*prop, 0, elt); | |
| 1786 return *prop; | |
| 1787 } | |
| 1788 else | |
| 1789 { | |
| 1790 Dynarr_free (*prop); | |
| 1791 return NULL; | |
| 1792 } | |
| 1793 } | |
| 1794 | |
| 3025 | 1795 /* Add `text' layout glyphs at position POS_TYPE that are contained to |
| 428 | 1796 the display block, but add all other types to the appropriate list |
| 1797 of the display line. They will be added later by different | |
| 1798 routines. */ | |
| 1799 | |
| 1800 static prop_block_dynarr * | |
| 1801 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type, | |
| 1802 int allow_cursor, struct glyph_cachel *cachel) | |
| 1803 { | |
| 1804 struct window *w = XWINDOW (data->window); | |
| 1805 | |
| 440 | 1806 /* If window faces changed, and glyph instance is text, then |
| 1807 glyph sizes might have changed too */ | |
| 1808 invalidate_glyph_geometry_maybe (gb->glyph, w); | |
| 1809 | |
| 442 | 1810 /* This makes sure the glyph is in the cachels. |
| 1811 | |
| 1812 #### We do this to make sure the glyph is in the glyph cachels, | |
| 1813 so that the dirty flag can be reset after redisplay has | |
| 1814 finished. We should do this some other way, maybe by iterating | |
| 1815 over the window cache of subwindows. */ | |
| 1816 get_glyph_cachel_index (w, gb->glyph); | |
| 1817 | |
| 428 | 1818 /* A nil extent indicates a special glyph (ex. truncator). */ |
| 1819 if (NILP (gb->extent) | |
| 1820 || (pos_type == BEGIN_GLYPHS && | |
| 1821 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT) | |
| 1822 || (pos_type == END_GLYPHS && | |
| 442 | 1823 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT) |
| 1824 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS) | |
| 428 | 1825 { |
| 1826 struct rune rb; | |
| 1827 int width; | |
| 1828 int xoffset = 0; | |
| 1829 int ascent, descent; | |
| 1830 Lisp_Object baseline; | |
| 1831 Lisp_Object face; | |
| 442 | 1832 Lisp_Object instance; |
| 1833 face_index findex; | |
| 819 | 1834 prop_block_dynarr *retval = 0; |
| 428 | 1835 |
| 1836 if (cachel) | |
| 1837 width = cachel->width; | |
| 1838 else | |
| 438 | 1839 width = glyph_width (gb->glyph, data->window); |
| 428 | 1840 |
| 1841 if (!width) | |
| 1842 return NULL; | |
| 1843 | |
| 1844 if (data->start_col || data->start_col_xoffset) | |
| 1845 { | |
| 1846 int glyph_char_width = width / space_width (w); | |
| 1847 | |
| 1848 /* If we still have not fully scrolled horizontally after | |
| 4187 | 1849 taking into account the width of the glyph, subtract its |
| 1850 width and return. */ | |
| 428 | 1851 if (glyph_char_width < data->start_col) |
| 1852 { | |
| 1853 data->start_col -= glyph_char_width; | |
| 1854 return NULL; | |
| 1855 } | |
| 1856 else if (glyph_char_width == data->start_col) | |
| 1857 width = 0; | |
| 1858 else | |
| 1859 { | |
| 1860 xoffset = space_width (w) * data->start_col; | |
| 1861 width -= xoffset; | |
| 1862 | |
| 1863 /* #### Can this happen? */ | |
| 1864 if (width < 0) | |
| 1865 width = 0; | |
| 1866 } | |
| 1867 | |
| 1868 data->start_col = 0; | |
| 1869 retval = add_hscroll_rune (data); | |
| 1870 | |
| 1871 /* Could be caused by the handling of the hscroll rune. */ | |
| 1872 if (retval != NULL || !width) | |
| 1873 return retval; | |
| 1874 } | |
| 1875 else | |
| 1876 xoffset = 0; | |
| 1877 | |
| 1878 if (data->pixpos + width > data->max_pixpos) | |
| 1879 { | |
| 1880 /* If this is the first object we are attempting to add to | |
| 819 | 1881 the line then we ignore the horizontal_clip threshold. |
| 1882 Otherwise we will loop until the bottom of the window | |
| 1883 continually failing to add this glyph because it is wider | |
| 1884 than the window. We could alternatively just completely | |
| 1885 ignore the glyph and proceed from there but I think that | |
| 1886 this is a better solution. | |
| 4187 | 1887 |
| 819 | 1888 This does, however, create a different problem in that we |
| 1889 can end up adding the object to every single line, never | |
| 1890 getting any further - for instance an extent with a long | |
| 1891 start-glyph that covers multitple following | |
| 1892 characters. */ | |
| 428 | 1893 if (Dynarr_length (data->db->runes) |
| 1894 && data->max_pixpos - data->pixpos < horizontal_clip) | |
| 1895 return ADD_FAILED; | |
| 819 | 1896 else { |
| 1897 struct prop_block pb; | |
| 1898 | |
| 1899 /* We need to account for the width of the end-of-line | |
| 1900 glyph if there is nothing more in the line to display, | |
| 1901 since we will not display it in this instance. It seems | |
| 1902 kind of gross doing it here, but otherwise we have to | |
| 1903 search the runes in create_text_block(). */ | |
| 1904 if (data->ch == '\n') | |
| 1905 data->max_pixpos += data->end_glyph_width; | |
| 428 | 1906 width = data->max_pixpos - data->pixpos; |
| 819 | 1907 /* Add the glyph we are displaying, but clipping, to the |
| 1908 propagation data so that we don't try and do it | |
| 4187 | 1909 again. */ |
| 819 | 1910 retval = Dynarr_new (prop_block); |
| 1911 pb.type = PROP_GLYPH; | |
| 1912 pb.data.p_glyph.glyph = gb->glyph; | |
| 1913 pb.data.p_glyph.width = width; | |
| 1914 Dynarr_add (retval, pb); | |
| 1915 } | |
| 428 | 1916 } |
| 1917 | |
| 1918 if (cachel) | |
| 1919 { | |
| 1920 ascent = cachel->ascent; | |
| 1921 descent = cachel->descent; | |
| 1922 } | |
| 1923 else | |
| 1924 { | |
| 438 | 1925 ascent = glyph_ascent (gb->glyph, data->window); |
| 1926 descent = glyph_descent (gb->glyph, data->window); | |
| 428 | 1927 } |
| 1928 | |
| 1929 baseline = glyph_baseline (gb->glyph, data->window); | |
| 1930 | |
| 819 | 1931 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */ |
| 1932 | |
| 428 | 1933 if (glyph_contrib_p (gb->glyph, data->window)) |
| 1934 { | |
| 1935 /* A pixmap that has not had a baseline explicitly set. Its | |
| 1936 contribution will be determined later. */ | |
| 1937 if (NILP (baseline)) | |
| 1938 { | |
| 1939 int height = ascent + descent; | |
| 819 | 1940 data->need_baseline_computation = 1; |
| 428 | 1941 data->max_pixmap_height = max (data->max_pixmap_height, height); |
| 1942 } | |
| 1943 | |
| 1944 /* A string so determine contribution normally. */ | |
| 1945 else if (EQ (baseline, Qt)) | |
| 1946 { | |
| 1947 data->new_ascent = max (data->new_ascent, ascent); | |
| 1948 data->new_descent = max (data->new_descent, descent); | |
| 1949 } | |
| 1950 | |
| 1951 /* A pixmap with an explicitly set baseline. We determine the | |
| 1952 contribution here. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
1953 else if (FIXNUMP (baseline)) |
| 428 | 1954 { |
| 1955 int height = ascent + descent; | |
| 1956 int pix_ascent, pix_descent; | |
| 1957 | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
1958 pix_ascent = height * XFIXNUM (baseline) / 100; |
| 428 | 1959 pix_descent = height - pix_ascent; |
| 1960 | |
| 1961 data->new_ascent = max (data->new_ascent, pix_ascent); | |
| 1962 data->new_descent = max (data->new_descent, pix_descent); | |
| 819 | 1963 data->max_pixmap_height = max (data->max_pixmap_height, height); |
| 4187 | 1964 |
| 819 | 1965 rb.object.dglyph.descent = pix_descent; |
| 428 | 1966 } |
| 1967 | |
| 1968 /* Otherwise something is screwed up. */ | |
| 1969 else | |
| 2500 | 1970 ABORT (); |
| 428 | 1971 } |
| 1972 | |
| 1973 face = glyph_face (gb->glyph, data->window); | |
| 1974 if (NILP (face)) | |
| 442 | 1975 findex = data->findex; |
| 428 | 1976 else |
| 442 | 1977 findex = get_builtin_face_cache_index (w, face); |
| 1978 | |
| 1979 instance = glyph_image_instance (gb->glyph, data->window, | |
| 793 | 1980 ERROR_ME_DEBUG_WARN, 1); |
| 442 | 1981 if (TEXT_IMAGE_INSTANCEP (instance)) |
| 1982 { | |
| 1983 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance); | |
| 1984 face_index orig_findex = data->findex; | |
| 826 | 1985 Bytebpos orig_charpos = data->byte_charpos; |
| 1986 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled; | |
| 442 | 1987 |
| 1988 data->findex = findex; | |
| 826 | 1989 data->byte_start_col_enabled = 0; |
| 442 | 1990 if (!allow_cursor) |
| 826 | 1991 data->byte_charpos = 0; |
| 867 | 1992 add_ibyte_string_runes (data, XSTRING_DATA (string), |
| 793 | 1993 XSTRING_LENGTH (string), 0, 1); |
| 442 | 1994 data->findex = orig_findex; |
| 826 | 1995 data->byte_charpos = orig_charpos; |
| 1996 data->byte_start_col_enabled = orig_start_col_enabled; | |
| 819 | 1997 return retval; |
| 442 | 1998 } |
| 1999 | |
| 2000 rb.findex = findex; | |
| 428 | 2001 rb.xpos = data->pixpos; |
| 2002 rb.width = width; | |
| 826 | 2003 rb.charpos = 0; /* glyphs are never "at" anywhere */ |
| 2004 if (data->byte_endpos) | |
| 428 | 2005 /* #### is this necessary at all? */ |
| 665 | 2006 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)), |
| 826 | 2007 data->byte_endpos); |
| 428 | 2008 else |
| 4187 | 2009 rb.endpos = 0; |
| 428 | 2010 rb.type = RUNE_DGLYPH; |
| 2011 rb.object.dglyph.glyph = gb->glyph; | |
| 2012 rb.object.dglyph.extent = gb->extent; | |
| 2013 rb.object.dglyph.xoffset = xoffset; | |
| 819 | 2014 rb.object.dglyph.ascent = ascent; |
| 2015 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has | |
| 2016 a normal (textual) baseline. */ | |
| 428 | 2017 |
| 2018 if (allow_cursor) | |
| 2019 { | |
| 826 | 2020 rb.charpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)), |
| 2021 data->byte_charpos); | |
| 428 | 2022 |
| 2023 if (data->cursor_type == CURSOR_ON) | |
| 2024 { | |
| 826 | 2025 if (data->byte_charpos == data->byte_cursor_charpos) |
| 428 | 2026 { |
| 2027 rb.cursor_type = CURSOR_ON; | |
| 2028 data->cursor_x = Dynarr_length (data->db->runes); | |
| 2029 } | |
| 2030 else | |
| 2031 rb.cursor_type = CURSOR_OFF; | |
| 2032 } | |
| 2033 else if (data->cursor_type == NEXT_CURSOR) | |
| 2034 { | |
| 2035 rb.cursor_type = CURSOR_ON; | |
| 2036 data->cursor_x = Dynarr_length (data->db->runes); | |
| 2037 data->cursor_type = NO_CURSOR; | |
| 2038 } | |
| 2039 else if (data->cursor_type == IGNORE_CURSOR) | |
| 2040 rb.cursor_type = IGNORE_CURSOR; | |
| 2041 else if (data->cursor_type == NO_CURSOR) | |
| 2042 rb.cursor_type = NO_CURSOR; | |
| 2043 else | |
| 2044 rb.cursor_type = CURSOR_OFF; | |
| 2045 } | |
| 2046 else | |
| 2047 rb.cursor_type = CURSOR_OFF; | |
| 2048 | |
| 2049 Dynarr_add (data->db->runes, rb); | |
| 2050 data->pixpos += width; | |
| 2051 | |
| 819 | 2052 return retval; |
| 428 | 2053 } |
| 2054 else | |
| 2055 { | |
| 2056 if (!NILP (glyph_face (gb->glyph, data->window))) | |
| 2057 gb->findex = | |
| 2058 get_builtin_face_cache_index (w, glyph_face (gb->glyph, | |
| 2059 data->window)); | |
| 2060 else | |
| 2061 gb->findex = data->findex; | |
| 2062 | |
| 2063 if (pos_type == BEGIN_GLYPHS) | |
| 2064 { | |
| 2065 if (!data->dl->left_glyphs) | |
| 2066 data->dl->left_glyphs = Dynarr_new (glyph_block); | |
| 2067 Dynarr_add (data->dl->left_glyphs, *gb); | |
| 2068 return NULL; | |
| 2069 } | |
| 2070 else if (pos_type == END_GLYPHS) | |
| 2071 { | |
| 2072 if (!data->dl->right_glyphs) | |
| 2073 data->dl->right_glyphs = Dynarr_new (glyph_block); | |
| 2074 Dynarr_add (data->dl->right_glyphs, *gb); | |
| 2075 return NULL; | |
| 2076 } | |
| 2077 else | |
| 2500 | 2078 ABORT (); /* there are no unknown types */ |
| 428 | 2079 } |
| 2080 | |
| 819 | 2081 return NULL; |
| 428 | 2082 } |
| 2083 | |
| 2084 /* Add all glyphs at position POS_TYPE that are contained in the given | |
| 2085 data. */ | |
| 2086 | |
| 2087 static prop_block_dynarr * | |
| 2088 add_glyph_runes (pos_data *data, int pos_type) | |
| 2089 { | |
| 2090 /* #### This still needs to handle the start_col parameter. Duh, Chuck, | |
| 2091 why didn't you just modify add_glyph_rune in the first place? */ | |
| 2092 int elt; | |
| 2093 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS | |
| 2094 ? data->ef->begin_glyphs | |
| 2095 : data->ef->end_glyphs); | |
| 2096 prop_block_dynarr *prop; | |
| 2097 | |
| 2098 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++) | |
| 2099 { | |
| 2100 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0, | |
| 2101 0); | |
| 2102 | |
| 2103 if (prop) | |
| 2104 { | |
| 2105 /* #### Add some propagation information. */ | |
| 2106 return prop; | |
| 2107 } | |
| 2108 } | |
| 2109 | |
| 2110 Dynarr_reset (glyph_arr); | |
| 2111 | |
| 2112 return NULL; | |
| 2113 } | |
| 2114 | |
| 2115 /* Given a position for a buffer in a window, ensure that the given | |
| 2116 display line DL accurately represents the text on a line starting | |
| 2117 at the given position. | |
| 2118 | |
| 826 | 2119 NOTE NOTE NOTE NOTE: This function works with and returns Bytebpos's. |
| 428 | 2120 You must do appropriate conversion. */ |
| 2121 | |
| 665 | 2122 static Bytebpos |
| 428 | 2123 create_text_block (struct window *w, struct display_line *dl, |
| 826 | 2124 Bytebpos byte_start_pos, prop_block_dynarr **prop, |
| 428 | 2125 int type) |
| 2126 { | |
| 2127 struct frame *f = XFRAME (w->frame); | |
| 2128 struct buffer *b = XBUFFER (w->buffer); | |
| 2129 struct device *d = XDEVICE (f->device); | |
| 2130 | |
| 2131 pos_data data; | |
| 2132 | |
| 2133 /* Don't display anything in the minibuffer if this window is not on | |
| 2134 a selected frame. We consider all other windows to be active | |
| 2135 minibuffers as it simplifies the coding. */ | |
| 2136 int active_minibuffer = (!MINI_WINDOW_P (w) || | |
| 2137 (f == device_selected_frame (d)) || | |
| 2138 is_surrogate_for_selected_frame (f)); | |
| 2139 | |
| 2140 int truncate_win = window_truncation_on (w); | |
| 2141 | |
| 2142 /* If the buffer's value of selective_display is an integer then | |
| 2143 only lines that start with less than selective_display columns of | |
| 2144 space will be displayed. If selective_display is t then all text | |
| 2145 after a ^M is invisible. */ | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2146 int selective = (FIXNUMP (b->selective_display) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2147 ? XFIXNUM (b->selective_display) |
| 434 | 2148 : (!NILP (b->selective_display) ? -1 : 0)); |
| 428 | 2149 |
| 2150 /* The variable ctl-arrow allows the user to specify what characters | |
| 2151 can actually be displayed and which octal should be used for. | |
| 2152 #### This variable should probably have some rethought done to | |
| 2153 it. | |
| 2154 | |
| 2367 | 2155 See also |
| 2156 | |
| 2157 (Info-goto-node "(internals)Future Work -- Display Tables") | |
| 2158 | |
| 2159 */ | |
| 867 | 2160 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow) |
| 428 | 2161 ? XCHAR_OR_CHAR_INT (b->ctl_arrow) |
| 2162 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil)) | |
| 2163 ? 255 : 160)); | |
| 2164 | |
| 2165 Lisp_Object face_dt, window_dt; | |
| 2166 | |
| 2167 /* The text display block for this display line. */ | |
| 2168 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 2169 | |
| 2170 /* The first time through the main loop we need to force the glyph | |
| 2171 data to be updated. */ | |
| 2172 int initial = 1; | |
| 2173 | |
| 2174 /* Apparently the new extent_fragment_update returns an end position | |
| 2175 equal to the position passed in if there are no more runs to be | |
| 2176 displayed. */ | |
| 2177 int no_more_frags = 0; | |
| 2178 | |
| 2179 Lisp_Object synch_minibuffers_value = | |
| 2180 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer); | |
| 2181 | |
| 2182 dl->used_prop_data = 0; | |
| 2183 dl->num_chars = 0; | |
| 442 | 2184 dl->line_continuation = 0; |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
2185 dl->clear_findex = DEFAULT_INDEX; |
| 428 | 2186 |
| 2187 xzero (data); | |
| 2188 data.ef = extent_fragment_new (w->buffer, f); | |
| 2189 | |
| 2190 /* These values are used by all of the rune addition routines. We add | |
| 2191 them to this structure for ease of passing. */ | |
| 2192 data.d = d; | |
| 793 | 2193 data.window = wrap_window (w); |
| 428 | 2194 data.string = Qnil; |
| 2195 data.db = db; | |
| 2196 data.dl = dl; | |
| 2197 | |
| 826 | 2198 data.byte_charpos = byte_start_pos; |
| 428 | 2199 data.pixpos = dl->bounds.left_in; |
| 2200 data.last_charset = Qunbound; | |
| 2201 data.last_findex = DEFAULT_INDEX; | |
| 2202 data.result_str = Qnil; | |
| 2203 | |
| 2204 /* Set the right boundary adjusting it to take into account any end | |
| 2205 glyph. Save the width of the end glyph for later use. */ | |
| 2206 data.max_pixpos = dl->bounds.right_in; | |
| 2207 if (truncate_win) | |
| 819 | 2208 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX); |
| 428 | 2209 else |
| 819 | 2210 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX); |
| 2211 data.max_pixpos -= data.end_glyph_width; | |
| 428 | 2212 |
| 2213 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f)) | |
| 2214 { | |
| 826 | 2215 data.byte_cursor_charpos = BYTE_BUF_ZV (b); |
| 428 | 2216 data.cursor_type = CURSOR_ON; |
| 2217 } | |
| 2218 else if (MINI_WINDOW_P (w) && !active_minibuffer) | |
| 2219 data.cursor_type = NO_CURSOR; | |
| 2220 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) && | |
| 5198 | 2221 EQ (DEVICE_CONSOLE (d), Vselected_console) && |
| 2222 d == XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d))))&& | |
| 2223 f == XFRAME (DEVICE_SELECTED_FRAME (d))) | |
| 428 | 2224 { |
| 826 | 2225 data.byte_cursor_charpos = BYTE_BUF_PT (b); |
| 428 | 2226 data.cursor_type = CURSOR_ON; |
| 2227 } | |
| 2228 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) | |
| 2229 { | |
| 826 | 2230 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]); |
| 428 | 2231 data.cursor_type = CURSOR_ON; |
| 2232 } | |
| 2233 else | |
| 2234 data.cursor_type = NO_CURSOR; | |
| 2235 data.cursor_x = -1; | |
| 2236 | |
| 2237 data.start_col = w->hscroll; | |
| 2238 data.start_col_xoffset = w->left_xoffset; | |
| 826 | 2239 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0); |
| 428 | 2240 data.hscroll_glyph_width_adjust = 0; |
| 2241 | |
| 2242 /* We regenerate the line from the very beginning. */ | |
| 2243 Dynarr_reset (db->runes); | |
| 2244 | |
| 2245 /* Why is this less than or equal and not just less than? If the | |
| 2246 starting position is already equal to the maximum we can't add | |
| 2247 anything else, right? Wrong. We might still have a newline to | |
| 2248 add. A newline can use the room allocated for an end glyph since | |
| 2249 if we add it we know we aren't going to be adding any end | |
| 2250 glyph. */ | |
| 2251 | |
| 2252 /* #### Chuck -- I think this condition should be while (1). | |
| 2253 Otherwise if (e.g.) there is one begin-glyph and one end-glyph | |
| 2254 and the begin-glyph ends exactly at the end of the window, the | |
| 2255 end-glyph and text might not be displayed. while (1) ensures | |
| 2256 that the loop terminates only when either (a) there is | |
| 2257 propagation data or (b) the end-of-line or end-of-buffer is hit. | |
| 2258 | |
| 2259 #### Also I think you need to ensure that the operation | |
| 2260 "add begin glyphs; add end glyphs; add text" is atomic and | |
| 2261 can't get interrupted in the middle. If you run off the end | |
| 2262 of the line during that operation, then you keep accumulating | |
| 2263 propagation data until you're done. Otherwise, if the (e.g.) | |
| 2264 there's a begin glyph at a particular position and attempting | |
| 2265 to display that glyph results in window-end being hit and | |
| 2266 propagation data being generated, then the character at that | |
| 2267 position won't be displayed. | |
| 2268 | |
| 2269 #### See also the comment after the end of this loop, below. | |
| 2270 */ | |
| 2271 while (data.pixpos <= data.max_pixpos | |
| 2272 && (active_minibuffer || !NILP (synch_minibuffers_value))) | |
| 2273 { | |
| 2274 /* #### This check probably should not be necessary. */ | |
| 826 | 2275 if (data.byte_charpos > BYTE_BUF_ZV (b)) |
| 428 | 2276 { |
| 2277 /* #### urk! More of this lossage! */ | |
| 826 | 2278 data.byte_charpos--; |
| 428 | 2279 goto done; |
| 2280 } | |
| 2281 | |
| 2282 /* If selective display was an integer and we aren't working on | |
| 4187 | 2283 a continuation line then find the next line we are actually |
| 2284 supposed to display. */ | |
| 428 | 2285 if (selective > 0 |
| 826 | 2286 && (data.byte_charpos == BYTE_BUF_BEGV (b) |
| 2287 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n')) | |
| 2288 { | |
| 2289 while (byte_spaces_at_point (b, data.byte_charpos) >= selective) | |
| 428 | 2290 { |
| 826 | 2291 data.byte_charpos = |
| 2292 byte_find_next_newline_no_quit (b, data.byte_charpos, 1); | |
| 2293 if (data.byte_charpos >= BYTE_BUF_ZV (b)) | |
| 428 | 2294 { |
| 826 | 2295 data.byte_charpos = BYTE_BUF_ZV (b); |
| 428 | 2296 goto done; |
| 2297 } | |
| 2298 } | |
| 2299 } | |
| 2300 | |
| 2301 /* Check for face changes. */ | |
| 826 | 2302 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end)) |
| 428 | 2303 { |
| 819 | 2304 Lisp_Object last_glyph = Qnil; |
| 2305 | |
| 2306 /* Deal with glyphs that we have already displayed. The | |
| 2307 theory is that if we end up with a PROP_GLYPH in the | |
| 2308 propagation data then we are clipping the glyph and there | |
| 2309 can be no propagation data before that point. The theory | |
| 2310 works because we always recalculate the extent-fragments | |
| 2311 for propagated data, we never actually propagate the | |
| 2312 fragments that still need to be displayed. */ | |
| 4967 | 2313 if (*prop && Dynarr_begin (*prop)->type == PROP_GLYPH) |
| 2314 { | |
| 2315 last_glyph = Dynarr_begin (*prop)->data.p_glyph.glyph; | |
| 819 | 2316 Dynarr_free (*prop); |
| 2317 *prop = 0; | |
| 2318 } | |
| 428 | 2319 /* Now compute the face and begin/end-glyph information. */ |
| 2320 data.findex = | |
| 665 | 2321 /* Remember that the extent-fragment routines deal in Bytebpos's. */ |
| 826 | 2322 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph); |
| 428 | 2323 |
| 2324 get_display_tables (w, data.findex, &face_dt, &window_dt); | |
| 2325 | |
| 826 | 2326 if (data.byte_charpos == data.ef->end) |
| 428 | 2327 no_more_frags = 1; |
| 2328 } | |
| 2329 initial = 0; | |
| 2330 | |
| 2331 /* Determine what is next to be displayed. We first handle any | |
| 4187 | 2332 glyphs returned by glyphs_at_charbpos. If there are no glyphs to |
| 2333 display then we determine what to do based on the character at the | |
| 2334 current buffer position. */ | |
| 428 | 2335 |
| 2336 /* If the current position is covered by an invisible extent, do | |
| 4187 | 2337 nothing (except maybe add some ellipses). |
| 428 | 2338 |
| 2339 #### The behavior of begin and end-glyphs at the edge of an | |
| 2340 invisible extent should be investigated further. This is | |
| 2341 fairly low priority though. */ | |
| 2342 if (data.ef->invisible) | |
| 2343 { | |
| 2344 /* #### Chuck, perhaps you could look at this code? I don't | |
| 2345 really know what I'm doing. */ | |
| 2346 if (*prop) | |
| 2347 { | |
| 2348 Dynarr_free (*prop); | |
| 2349 *prop = 0; | |
| 2350 } | |
| 2351 | |
| 2352 /* The extent fragment code only sets this when we should | |
| 2353 really display the ellipses. It makes sure the ellipses | |
| 2354 don't get displayed more than once in a row. */ | |
| 2355 if (data.ef->invisible_ellipses) | |
| 2356 { | |
| 2357 struct glyph_block gb; | |
| 2358 | |
| 2359 data.ef->invisible_ellipses_already_displayed = 1; | |
| 2360 data.ef->invisible_ellipses = 0; | |
| 2361 gb.extent = Qnil; | |
| 2362 gb.glyph = Vinvisible_text_glyph; | |
| 2363 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 2364 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 2365 /* Perhaps they shouldn't propagate if the very next thing | |
| 2366 is to display a newline (for compatibility with | |
| 2367 selective-display-ellipses)? Maybe that's too | |
| 2368 abstruse. */ | |
| 2369 if (*prop) | |
| 2370 goto done; | |
| 2371 } | |
| 2372 | |
| 2373 /* If point is in an invisible region we place it on the | |
| 4187 | 2374 next visible character. */ |
| 428 | 2375 if (data.cursor_type == CURSOR_ON |
| 826 | 2376 && data.byte_charpos == data.byte_cursor_charpos) |
| 428 | 2377 { |
| 2378 data.cursor_type = NEXT_CURSOR; | |
| 2379 } | |
| 2380 | |
| 2381 /* #### What if we we're dealing with a display table? */ | |
| 2382 if (data.start_col) | |
| 2383 data.start_col--; | |
| 2384 | |
| 826 | 2385 if (data.byte_charpos == BYTE_BUF_ZV (b)) |
| 428 | 2386 goto done; |
| 2387 else | |
| 826 | 2388 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2389 } |
| 2390 | |
| 2391 /* If there is propagation data, then it represents the current | |
| 819 | 2392 buffer position being displayed. Add them and advance the |
| 2393 position counter. This might also add the minibuffer | |
| 2394 prompt. */ | |
| 428 | 2395 else if (*prop) |
| 2396 { | |
| 2397 dl->used_prop_data = 1; | |
| 2398 *prop = add_propagation_runes (prop, &data); | |
| 2399 | |
| 2400 if (*prop) | |
| 2401 goto done; /* gee, a really narrow window */ | |
| 826 | 2402 else if (data.byte_charpos == BYTE_BUF_ZV (b)) |
| 428 | 2403 goto done; |
| 826 | 2404 else if (data.byte_charpos < BYTE_BUF_BEGV (b)) |
| 428 | 2405 /* #### urk urk urk! Aborts are not very fun! Fix this please! */ |
| 826 | 2406 data.byte_charpos = BYTE_BUF_BEGV (b); |
| 428 | 2407 else |
| 826 | 2408 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2409 } |
| 2410 | |
| 2411 /* If there are end glyphs, add them to the line. These are | |
| 2412 the end glyphs for the previous run of text. We add them | |
| 2413 here rather than doing them at the end of handling the | |
| 2414 previous run so that glyphs at the beginning and end of | |
| 2415 a line are handled correctly. */ | |
| 819 | 2416 else if (Dynarr_length (data.ef->end_glyphs) > 0 |
| 2417 || Dynarr_length (data.ef->begin_glyphs) > 0) | |
| 2418 { | |
| 2419 glyph_block_dynarr* tmpglyphs = 0; | |
| 2420 /* #### I think this is safe, but could be wrong. */ | |
| 826 | 2421 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos); |
| 819 | 2422 |
| 4187 | 2423 if (Dynarr_length (data.ef->end_glyphs) > 0) |
| 819 | 2424 { |
| 2425 *prop = add_glyph_runes (&data, END_GLYPHS); | |
| 2426 tmpglyphs = data.ef->end_glyphs; | |
| 2427 } | |
| 2428 | |
| 2429 /* If there are begin glyphs, add them to the line. */ | |
| 4187 | 2430 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0) |
| 819 | 2431 { |
| 2432 *prop = add_glyph_runes (&data, BEGIN_GLYPHS); | |
| 2433 tmpglyphs = data.ef->begin_glyphs; | |
| 2434 } | |
| 2435 | |
| 4187 | 2436 if (*prop) |
| 819 | 2437 { |
| 2438 /* If we just clipped a glyph and we are at the end of a | |
| 2439 line and there are more glyphs to display then do | |
| 2440 appropriate processing to not get a continuation | |
| 2441 glyph. */ | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2442 if (*prop != ADD_FAILED |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2443 && Dynarr_begin (*prop)->type == PROP_GLYPH |
| 819 | 2444 && data.ch == '\n') |
| 4187 | 2445 { |
| 819 | 2446 /* If there are no more glyphs then do the normal |
| 4187 | 2447 processing. |
| 819 | 2448 |
| 2449 #### This doesn't actually work if the same glyph is | |
| 2450 present more than once in the block. To solve | |
| 2451 this we would have to carry the index around | |
| 2452 which might be problematic since the fragment is | |
| 2453 recalculated for each line. */ | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2454 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
|
2455 Dynarr_begin (*prop)->data.p_glyph.glyph)) |
| 819 | 2456 { |
| 2457 Dynarr_free (*prop); | |
| 2458 *prop = 0; | |
| 2459 } | |
| 2460 else { | |
| 2461 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 867 | 2462 add_ichar_rune (&data); /* discard prop data. */ |
| 819 | 2463 goto done; |
| 2464 } | |
| 2465 } | |
| 2466 else | |
| 2467 goto done; | |
| 2468 } | |
| 428 | 2469 } |
| 2470 | |
| 2471 /* If at end-of-buffer, we've already processed begin and | |
| 2472 end-glyphs at this point and there's no text to process, | |
| 2473 so we're done. */ | |
| 826 | 2474 else if (data.byte_charpos == BYTE_BUF_ZV (b)) |
| 428 | 2475 goto done; |
| 2476 | |
| 2477 else | |
| 2478 { | |
| 2479 Lisp_Object entry = Qnil; | |
| 2480 /* Get the character at the current buffer position. */ | |
| 826 | 2481 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos); |
| 428 | 2482 if (!NILP (face_dt) || !NILP (window_dt)) |
| 2483 entry = display_table_entry (data.ch, face_dt, window_dt); | |
| 2484 | |
| 2485 /* If there is a display table entry for it, hand it off to | |
| 4187 | 2486 add_disp_table_entry_runes and let it worry about it. */ |
| 428 | 2487 if (!NILP (entry) && !EQ (entry, make_char (data.ch))) |
| 2488 { | |
| 2489 *prop = add_disp_table_entry_runes (&data, entry); | |
| 2490 | |
| 2491 if (*prop) | |
| 2492 goto done; | |
| 2493 } | |
| 2494 | |
| 2495 /* Check if we have hit a newline character. If so, add a marker | |
| 4187 | 2496 to the line and end this loop. */ |
| 428 | 2497 else if (data.ch == '\n') |
| 2498 { | |
|
5619
75ad4969a16d
Replace the 'flush face property with the opposite 'shrink one.
Didier Verna <didier@xemacs.org>
parents:
5617
diff
changeset
|
2499 /* Update the clearing face index unless the shrink property is |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
2500 set. -- dvl */ |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
2501 if ((data.findex > DEFAULT_INDEX) |
|
5619
75ad4969a16d
Replace the 'flush face property with the opposite 'shrink one.
Didier Verna <didier@xemacs.org>
parents:
5617
diff
changeset
|
2502 && ! WINDOW_FACE_CACHEL_SHRINK_P (w, data.findex)) |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
2503 dl->clear_findex = data.findex; |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
2504 |
| 428 | 2505 /* We aren't going to be adding an end glyph so give its |
| 4187 | 2506 space back in order to make sure that the cursor can |
| 2507 fit. */ | |
| 819 | 2508 data.max_pixpos += data.end_glyph_width; |
| 428 | 2509 |
| 2510 if (selective > 0 | |
| 826 | 2511 && (byte_spaces_at_point |
| 2512 (b, next_bytebpos (b, data.byte_charpos)) | |
| 428 | 2513 >= selective)) |
| 2514 { | |
| 2515 if (!NILP (b->selective_display_ellipses)) | |
| 2516 { | |
| 2517 struct glyph_block gb; | |
| 2518 | |
| 2519 gb.extent = Qnil; | |
| 2520 gb.glyph = Vinvisible_text_glyph; | |
| 2521 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 2522 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 2523 } | |
| 2524 else | |
| 2525 { | |
| 2526 /* Cheesy, cheesy, cheesy. We mark the end of the | |
| 2527 line with a special "character rune" whose width | |
| 2528 is the EOL cursor width and whose character is | |
| 2529 the non-printing character '\n'. */ | |
| 2530 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 867 | 2531 *prop = add_ichar_rune (&data); |
| 428 | 2532 } |
| 2533 | |
| 826 | 2534 /* We need to set data.byte_charpos to the start of the |
| 4187 | 2535 next visible region in order to make this line |
| 2536 appear to contain all of the invisible area. | |
| 2537 Otherwise, the line cache won't work | |
| 2538 correctly. */ | |
| 826 | 2539 INC_BYTEBPOS (b, data.byte_charpos); |
| 2540 while (byte_spaces_at_point (b, data.byte_charpos) >= selective) | |
| 428 | 2541 { |
| 826 | 2542 data.byte_charpos = |
| 2543 byte_find_next_newline_no_quit (b, data.byte_charpos, 1); | |
| 2544 if (data.byte_charpos >= BYTE_BUF_ZV (b)) | |
| 428 | 2545 { |
| 826 | 2546 data.byte_charpos = BYTE_BUF_ZV (b); |
| 428 | 2547 break; |
| 2548 } | |
| 2549 } | |
| 826 | 2550 if (BYTE_BUF_FETCH_CHAR |
| 2551 (b, prev_bytebpos (b, data.byte_charpos)) == '\n') | |
| 2552 DEC_BYTEBPOS (b, data.byte_charpos); | |
| 428 | 2553 } |
| 2554 else | |
| 2555 { | |
| 2556 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 867 | 2557 *prop = add_ichar_rune (&data); |
| 428 | 2558 } |
| 2559 | |
| 2560 goto done; | |
| 2561 } | |
| 2562 | |
| 2563 /* If the current character is ^M, and selective display is | |
| 4187 | 2564 enabled, then add the invisible-text-glyph if |
| 2565 selective-display-ellipses is set. In any case, this | |
| 2566 line is done. */ | |
| 428 | 2567 else if (data.ch == (('M' & 037)) && selective == -1) |
| 2568 { | |
| 826 | 2569 Bytebpos byte_next_charpos; |
| 428 | 2570 |
| 2571 /* Find the buffer position at the end of the line. */ | |
| 826 | 2572 byte_next_charpos = |
| 2573 byte_find_next_newline_no_quit (b, data.byte_charpos, 1); | |
| 2574 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos)) | |
| 428 | 2575 == '\n') |
| 826 | 2576 DEC_BYTEBPOS (b, byte_next_charpos); |
| 428 | 2577 |
| 2578 /* If the cursor is somewhere in the elided text make | |
| 4187 | 2579 sure that the cursor gets drawn appropriately. */ |
| 428 | 2580 if (data.cursor_type == CURSOR_ON |
| 826 | 2581 && (data.byte_cursor_charpos >= data.byte_charpos && |
| 2582 data.byte_cursor_charpos < byte_next_charpos)) | |
| 428 | 2583 { |
| 2584 data.cursor_type = NEXT_CURSOR; | |
| 2585 } | |
| 2586 | |
| 2587 /* We won't be adding a truncation or continuation glyph | |
| 4187 | 2588 so give up the room allocated for them. */ |
| 819 | 2589 data.max_pixpos += data.end_glyph_width; |
| 428 | 2590 |
| 2591 if (!NILP (b->selective_display_ellipses)) | |
| 2592 { | |
| 2593 /* We don't propagate anything from the invisible | |
| 4187 | 2594 text glyph if it fails to fit. This is |
| 2595 intentional. */ | |
| 428 | 2596 struct glyph_block gb; |
| 2597 | |
| 2598 gb.extent = Qnil; | |
| 2599 gb.glyph = Vinvisible_text_glyph; | |
| 2600 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, | |
| 2601 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 2602 } | |
| 2603 | |
| 2604 /* Set the buffer position to the end of the line. We | |
| 4187 | 2605 need to do this before potentially adding a newline |
| 2606 so that the cursor flag will get set correctly (if | |
| 2607 needed). */ | |
| 826 | 2608 data.byte_charpos = byte_next_charpos; |
| 428 | 2609 |
| 2610 if (NILP (b->selective_display_ellipses) | |
| 826 | 2611 || data.byte_cursor_charpos == byte_next_charpos) |
| 428 | 2612 { |
| 2613 /* We have to at least add a newline character so | |
| 4187 | 2614 that the cursor shows up properly. */ |
| 428 | 2615 data.ch = '\n'; |
| 2616 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 2617 data.findex = DEFAULT_INDEX; | |
| 2618 data.start_col = 0; | |
| 2619 data.start_col_xoffset = 0; | |
| 826 | 2620 data.byte_start_col_enabled = 0; |
| 428 | 2621 |
| 867 | 2622 add_ichar_rune (&data); |
| 428 | 2623 } |
| 2624 | |
| 2625 /* This had better be a newline but doing it this way | |
| 4187 | 2626 we'll see obvious incorrect results if it isn't. No |
| 2627 need to abort here. */ | |
| 826 | 2628 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos); |
| 428 | 2629 |
| 2630 goto done; | |
| 2631 } | |
| 2632 | |
| 2633 /* If the current character is considered to be printable, then | |
| 4187 | 2634 just add it. */ |
| 428 | 2635 else if (data.ch >= printable_min) |
| 2636 { | |
| 867 | 2637 *prop = add_ichar_rune (&data); |
| 428 | 2638 if (*prop) |
| 2639 goto done; | |
| 2640 } | |
| 2641 | |
| 2642 /* If the current character is a tab, determine the next tab | |
| 4187 | 2643 starting position and add a blank rune which extends from the |
| 2644 current pixel position to that starting position. */ | |
| 428 | 2645 else if (data.ch == '\t') |
| 2646 { | |
| 2647 int tab_start_pixpos = data.pixpos; | |
| 2648 int next_tab_start; | |
| 2649 int char_tab_width; | |
| 2650 int prop_width = 0; | |
| 2651 | |
| 2652 if (data.start_col > 1) | |
| 434 | 2653 tab_start_pixpos -= (space_width (w) * (data.start_col - 1)) |
| 428 | 2654 + data.start_col_xoffset; |
| 2655 | |
| 2656 next_tab_start = | |
| 2657 next_tab_position (w, tab_start_pixpos, | |
| 2658 dl->bounds.left_in + | |
| 2659 data.hscroll_glyph_width_adjust); | |
| 2660 if (next_tab_start > data.max_pixpos) | |
| 2661 { | |
| 2662 prop_width = next_tab_start - data.max_pixpos; | |
| 2663 next_tab_start = data.max_pixpos; | |
| 2664 } | |
| 2665 data.blank_width = next_tab_start - data.pixpos; | |
| 2666 char_tab_width = | |
| 2667 (next_tab_start - tab_start_pixpos) / space_width (w); | |
| 2668 | |
| 2669 *prop = add_blank_rune (&data, w, char_tab_width); | |
| 2670 | |
| 2671 /* add_blank_rune is only supposed to be called with | |
| 4187 | 2672 sizes guaranteed to fit in the available space. */ |
| 428 | 2673 assert (!(*prop)); |
| 2674 | |
| 2675 if (prop_width) | |
| 2676 { | |
| 2677 struct prop_block pb; | |
| 2678 *prop = Dynarr_new (prop_block); | |
| 2679 | |
| 2680 pb.type = PROP_BLANK; | |
| 2681 pb.data.p_blank.width = prop_width; | |
| 2682 pb.data.p_blank.findex = data.findex; | |
| 2683 Dynarr_add (*prop, pb); | |
| 2684 | |
| 2685 goto done; | |
| 2686 } | |
| 2687 } | |
| 2688 | |
| 2689 /* If character is a control character, pass it off to | |
| 4187 | 2690 add_control_char_runes. |
| 428 | 2691 |
| 2692 The is_*() routines have undefined results on | |
| 2693 arguments outside of the range [-1, 255]. (This | |
| 2694 often bites people who carelessly use `char' instead | |
| 2695 of `unsigned char'.) | |
| 2696 */ | |
| 867 | 2697 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch)) |
| 428 | 2698 { |
| 2699 *prop = add_control_char_runes (&data, b); | |
| 2700 | |
| 2701 if (*prop) | |
| 2702 goto done; | |
| 2703 } | |
| 2704 | |
| 2705 /* If the character is above the ASCII range and we have not | |
| 4187 | 2706 already handled it, then print it as an octal number. */ |
| 428 | 2707 else if (data.ch >= 0200) |
| 2708 { | |
| 2709 *prop = add_octal_runes (&data); | |
| 2710 | |
| 2711 if (*prop) | |
| 2712 goto done; | |
| 2713 } | |
| 2714 | |
| 2715 /* Assume the current character is considered to be printable, | |
| 4187 | 2716 then just add it. */ |
| 428 | 2717 else |
| 2718 { | |
| 867 | 2719 *prop = add_ichar_rune (&data); |
| 428 | 2720 if (*prop) |
| 2721 goto done; | |
| 2722 } | |
| 2723 | |
| 826 | 2724 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2725 } |
| 2726 } | |
| 2727 | |
| 2728 done: | |
| 2729 | |
| 2730 /* Determine the starting point of the next line if we did not hit the | |
| 2731 end of the buffer. */ | |
| 826 | 2732 if (data.byte_charpos < BYTE_BUF_ZV (b) |
| 428 | 2733 && (active_minibuffer || !NILP (synch_minibuffers_value))) |
| 2734 { | |
| 2735 /* #### This check is not correct. If the line terminated | |
| 2736 due to a begin-glyph or end-glyph hitting window-end, then | |
| 826 | 2737 data.ch will not point to the character at data.byte_charpos. If |
| 428 | 2738 you make the two changes mentioned at the top of this loop, |
| 2739 you should be able to say '(if (*prop))'. That should also | |
| 826 | 2740 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b) |
| 428 | 2741 check. */ |
| 2742 | |
| 2743 /* The common case is that the line ended because we hit a newline. | |
| 4187 | 2744 In that case, the next character is just the next buffer |
| 2745 position. */ | |
| 428 | 2746 if (data.ch == '\n') |
| 2747 { | |
| 2748 /* If data.start_col_enabled is still true, then the window is | |
| 4187 | 2749 scrolled far enough so that nothing on this line is visible. |
| 2750 We need to stick a truncation glyph at the beginning of the | |
| 2751 line in that case unless the line is completely blank. */ | |
| 826 | 2752 if (data.byte_start_col_enabled) |
| 428 | 2753 { |
| 2754 if (data.cursor_type == CURSOR_ON) | |
| 2755 { | |
| 826 | 2756 if (data.byte_cursor_charpos >= byte_start_pos |
| 2757 && data.byte_cursor_charpos <= data.byte_charpos) | |
| 2758 data.byte_cursor_charpos = data.byte_charpos; | |
| 428 | 2759 } |
| 2760 data.findex = DEFAULT_INDEX; | |
| 2761 data.start_col = 0; | |
| 826 | 2762 data.byte_start_col_enabled = 0; |
| 2763 | |
| 2764 if (data.byte_charpos != byte_start_pos) | |
| 428 | 2765 { |
| 2766 struct glyph_block gb; | |
| 2767 | |
| 2768 gb.extent = Qnil; | |
| 2769 gb.glyph = Vhscroll_glyph; | |
| 2770 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 2771 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX)); | |
| 2772 } | |
| 2773 else | |
| 2774 { | |
| 2775 /* This duplicates code down below to add a newline to | |
| 4187 | 2776 the end of an otherwise empty line.*/ |
| 428 | 2777 data.ch = '\n'; |
| 2778 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 2779 | |
| 867 | 2780 add_ichar_rune (&data); |
| 428 | 2781 } |
| 2782 } | |
| 2783 | |
| 826 | 2784 INC_BYTEBPOS (b, data.byte_charpos); |
| 428 | 2785 } |
| 2786 | |
| 2787 /* Otherwise we have a buffer line which cannot fit on one display | |
| 4187 | 2788 line. */ |
| 428 | 2789 else |
| 2790 { | |
| 2791 struct glyph_block gb; | |
| 2792 struct glyph_cachel *cachel; | |
| 2793 | |
| 2794 /* If the line is to be truncated then we actually have to look | |
| 4187 | 2795 for the next newline. We also add the end-of-line glyph which |
| 2796 we know will fit because we adjusted the right border before | |
| 2797 we starting laying out the line. */ | |
| 819 | 2798 data.max_pixpos += data.end_glyph_width; |
| 428 | 2799 data.findex = DEFAULT_INDEX; |
| 2800 gb.extent = Qnil; | |
| 2801 | |
| 2802 if (truncate_win) | |
| 2803 { | |
| 826 | 2804 Bytebpos byte_pos; |
| 428 | 2805 |
| 2806 /* Now find the start of the next line. */ | |
| 826 | 2807 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1); |
| 428 | 2808 |
| 2809 /* If the cursor is past the truncation line then we | |
| 4187 | 2810 make it appear on the truncation glyph. If we've hit |
| 2811 the end of the buffer then we also make the cursor | |
| 2812 appear unless eob is immediately preceded by a | |
| 2813 newline. In that case the cursor should actually | |
| 2814 appear on the next line. */ | |
| 428 | 2815 if (data.cursor_type == CURSOR_ON |
| 826 | 2816 && data.byte_cursor_charpos >= data.byte_charpos |
| 2817 && (data.byte_cursor_charpos < byte_pos || | |
| 2818 (byte_pos == BYTE_BUF_ZV (b) | |
| 2819 && (byte_pos == BYTE_BUF_BEGV (b) | |
| 2820 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos)) | |
| 428 | 2821 != '\n'))))) |
| 826 | 2822 data.byte_cursor_charpos = byte_pos; |
| 428 | 2823 else |
| 2824 data.cursor_type = NO_CURSOR; | |
| 2825 | |
| 826 | 2826 data.byte_charpos = byte_pos; |
| 428 | 2827 gb.glyph = Vtruncation_glyph; |
| 2828 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX); | |
| 2829 } | |
| 2830 else | |
| 2831 { | |
| 2832 /* The cursor can never be on the continuation glyph. */ | |
| 2833 data.cursor_type = NO_CURSOR; | |
| 2834 | |
| 826 | 2835 /* data.byte_charpos is already at the start of the next line. */ |
| 428 | 2836 |
| 442 | 2837 dl->line_continuation = 1; |
| 428 | 2838 gb.glyph = Vcontinuation_glyph; |
| 2839 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX); | |
| 2840 } | |
| 2841 | |
| 442 | 2842 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel); |
| 428 | 2843 |
| 826 | 2844 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b) |
| 2845 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n') | |
| 428 | 2846 /* #### Damn this losing shit. */ |
| 826 | 2847 data.byte_charpos++; |
| 428 | 2848 } |
| 2849 } | |
| 2850 else if ((active_minibuffer || !NILP (synch_minibuffers_value)) | |
| 826 | 2851 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b))) |
| 428 | 2852 { |
| 2853 /* We need to add a marker to the end of the line since there is no | |
| 4187 | 2854 newline character in order for the cursor to get drawn. We label |
| 2855 it as a newline so that it gets handled correctly by the | |
| 2856 whitespace routines below. */ | |
| 428 | 2857 |
| 2858 data.ch = '\n'; | |
| 2859 data.blank_width = DEVMETH (d, eol_cursor_width, ()); | |
| 2860 data.findex = DEFAULT_INDEX; | |
| 2861 data.start_col = 0; | |
| 2862 data.start_col_xoffset = 0; | |
| 826 | 2863 data.byte_start_col_enabled = 0; |
| 428 | 2864 |
| 2865 data.max_pixpos += data.blank_width; | |
| 867 | 2866 add_ichar_rune (&data); |
| 428 | 2867 data.max_pixpos -= data.blank_width; |
| 2868 | |
| 2869 /* #### urk! Chuck, this shit is bad news. Going around | |
| 2870 manipulating invalid positions is guaranteed to result in | |
| 2871 trouble sooner or later. */ | |
| 826 | 2872 data.byte_charpos = BYTE_BUF_ZV (b) + 1; |
| 428 | 2873 } |
| 2874 | |
| 2875 /* Calculate left whitespace boundary. */ | |
| 2876 { | |
| 2877 int elt = 0; | |
| 2878 | |
| 2879 /* Whitespace past a newline is considered right whitespace. */ | |
| 2880 while (elt < Dynarr_length (db->runes)) | |
| 2881 { | |
| 2882 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 2883 | |
| 2884 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ') | |
| 2885 || rb->type == RUNE_BLANK) | |
| 2886 { | |
| 2887 dl->bounds.left_white += rb->width; | |
| 2888 elt++; | |
| 2889 } | |
| 2890 else | |
| 2891 elt = Dynarr_length (db->runes); | |
| 2892 } | |
| 2893 } | |
| 2894 | |
| 2895 /* Calculate right whitespace boundary. */ | |
| 2896 { | |
| 2897 int elt = Dynarr_length (db->runes) - 1; | |
| 2898 int done = 0; | |
| 2899 | |
| 2900 while (!done && elt >= 0) | |
| 2901 { | |
| 2902 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 2903 | |
| 2904 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100 | |
| 2905 && isspace (rb->object.chr.ch)) | |
| 2906 && !rb->type == RUNE_BLANK) | |
| 2907 { | |
| 2908 dl->bounds.right_white = rb->xpos + rb->width; | |
| 2909 done = 1; | |
| 2910 } | |
| 2911 | |
| 2912 elt--; | |
| 2913 | |
| 2914 } | |
| 2915 | |
| 2916 /* The line is blank so everything is considered to be right | |
| 2917 whitespace. */ | |
| 2918 if (!done) | |
| 2919 dl->bounds.right_white = dl->bounds.left_in; | |
| 2920 } | |
| 2921 | |
| 2922 /* Set the display blocks bounds. */ | |
| 2923 db->start_pos = dl->bounds.left_in; | |
| 2924 if (Dynarr_length (db->runes)) | |
| 2925 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
2926 struct rune *rb = Dynarr_lastp (db->runes); |
| 428 | 2927 |
| 2928 db->end_pos = rb->xpos + rb->width; | |
| 2929 } | |
| 2930 else | |
| 2931 db->end_pos = dl->bounds.right_white; | |
| 2932 | |
| 819 | 2933 calculate_baseline (&data); |
| 428 | 2934 |
| 2935 dl->ascent = data.new_ascent; | |
| 2936 dl->descent = data.new_descent; | |
| 2937 | |
| 2938 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2939 unsigned short ascent = (unsigned short) XFIXNUM (w->minimum_line_ascent); |
| 428 | 2940 |
| 2941 if (dl->ascent < ascent) | |
| 2942 dl->ascent = ascent; | |
| 2943 } | |
| 2944 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
2945 unsigned short descent = (unsigned short) XFIXNUM (w->minimum_line_descent); |
| 428 | 2946 |
| 2947 if (dl->descent < descent) | |
| 2948 dl->descent = descent; | |
| 2949 } | |
| 2950 | |
| 819 | 2951 calculate_yoffset (dl, db); |
| 2952 | |
| 428 | 2953 dl->cursor_elt = data.cursor_x; |
| 2954 /* #### lossage lossage lossage! Fix this shit! */ | |
| 826 | 2955 if (data.byte_charpos > BYTE_BUF_ZV (b)) |
| 2956 dl->end_charpos = BUF_ZV (b); | |
| 428 | 2957 else |
| 826 | 2958 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1; |
| 428 | 2959 if (truncate_win) |
| 826 | 2960 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0); |
| 428 | 2961 else |
| 2962 /* This doesn't correctly take into account tabs and control | |
| 2963 characters but if the window isn't being truncated then this | |
| 2964 value isn't going to end up being used anyhow. */ | |
| 826 | 2965 data.dl->num_chars = dl->end_charpos - dl->charpos; |
| 428 | 2966 |
| 2967 /* #### handle horizontally scrolled line with text none of which | |
| 2968 was actually laid out. */ | |
| 2969 | |
| 2970 /* #### handle any remainder of overlay arrow */ | |
| 2971 | |
| 2972 if (*prop == ADD_FAILED) | |
| 2973 *prop = NULL; | |
| 2974 | |
| 2975 if (truncate_win && *prop) | |
| 2976 { | |
| 2977 Dynarr_free (*prop); | |
| 2978 *prop = NULL; | |
| 2979 } | |
| 2980 | |
| 2981 extent_fragment_delete (data.ef); | |
| 2982 | |
| 2983 /* #### If we started at EOB, then make sure we return a value past | |
| 2984 it so that regenerate_window will exit properly. This is bogus. | |
| 2985 The main loop should get fixed so that it isn't necessary to call | |
| 2986 this function if we are already at EOB. */ | |
| 2987 | |
| 826 | 2988 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b)) |
| 2989 return data.byte_charpos + 1; /* Yuck! */ | |
| 428 | 2990 else |
| 826 | 2991 return data.byte_charpos; |
| 428 | 2992 } |
| 2993 | |
| 2994 /* Display the overlay arrow at the beginning of the given line. */ | |
| 2995 | |
| 2996 static int | |
| 2997 create_overlay_glyph_block (struct window *w, struct display_line *dl) | |
| 2998 { | |
| 2999 struct frame *f = XFRAME (w->frame); | |
| 3000 struct device *d = XDEVICE (f->device); | |
| 3001 pos_data data; | |
| 3002 | |
| 3003 /* If Voverlay_arrow_string isn't valid then just fail silently. */ | |
| 3004 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string)) | |
| 3005 return 0; | |
| 3006 | |
| 3007 xzero (data); | |
| 3008 data.ef = NULL; | |
| 3009 data.d = d; | |
| 793 | 3010 data.window = wrap_window (w); |
| 428 | 3011 data.db = get_display_block_from_line (dl, OVERWRITE); |
| 3012 data.dl = dl; | |
| 3013 data.pixpos = dl->bounds.left_in; | |
| 3014 data.max_pixpos = dl->bounds.right_in; | |
| 3015 data.cursor_type = NO_CURSOR; | |
| 3016 data.cursor_x = -1; | |
| 3017 data.findex = DEFAULT_INDEX; | |
| 3018 data.last_charset = Qunbound; | |
| 3019 data.last_findex = DEFAULT_INDEX; | |
| 3020 data.result_str = Qnil; | |
| 3021 data.string = Qnil; | |
| 3022 | |
| 3023 Dynarr_reset (data.db->runes); | |
| 3024 | |
| 3025 if (STRINGP (Voverlay_arrow_string)) | |
| 3026 { | |
| 867 | 3027 add_ibyte_string_runes |
| 428 | 3028 (&data, |
| 3029 XSTRING_DATA (Voverlay_arrow_string), | |
| 3030 XSTRING_LENGTH (Voverlay_arrow_string), | |
| 793 | 3031 1, 0); |
| 428 | 3032 } |
| 3033 else if (GLYPHP (Voverlay_arrow_string)) | |
| 3034 { | |
| 3035 struct glyph_block gb; | |
| 3036 | |
| 3037 gb.glyph = Voverlay_arrow_string; | |
| 3038 gb.extent = Qnil; | |
| 3039 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0); | |
| 3040 } | |
| 4187 | 3041 |
| 428 | 3042 if (data.max_pixmap_height) |
| 3043 { | |
| 3044 int height = data.new_ascent + data.new_descent; | |
| 3045 int pix_ascent, pix_descent; | |
| 4187 | 3046 |
| 428 | 3047 pix_descent = data.max_pixmap_height * data.new_descent / height; |
| 3048 pix_ascent = data.max_pixmap_height - pix_descent; | |
| 819 | 3049 calculate_baseline (&data); |
| 428 | 3050 |
| 3051 data.new_ascent = max (data.new_ascent, pix_ascent); | |
| 3052 data.new_descent = max (data.new_descent, pix_descent); | |
| 3053 } | |
| 3054 | |
| 3055 dl->ascent = data.new_ascent; | |
| 3056 dl->descent = data.new_descent; | |
| 3057 | |
| 3058 data.db->start_pos = dl->bounds.left_in; | |
| 3059 data.db->end_pos = data.pixpos; | |
| 3060 | |
| 819 | 3061 calculate_yoffset (dl, data.db); |
| 3062 | |
| 428 | 3063 return data.pixpos - dl->bounds.left_in; |
| 3064 } | |
| 3065 | |
| 3066 /* Add a type of glyph to a margin display block. */ | |
| 3067 | |
| 3068 static int | |
| 3069 add_margin_runes (struct display_line *dl, struct display_block *db, int start, | |
| 3070 int count, enum glyph_layout layout, int side, Lisp_Object window) | |
| 3071 { | |
| 3072 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS | |
| 3073 ? dl->left_glyphs | |
| 3074 : dl->right_glyphs); | |
| 3075 int elt, end; | |
| 3076 int reverse; | |
| 442 | 3077 struct window *w = XWINDOW (window); |
| 3078 struct frame *f = XFRAME (w->frame); | |
| 3079 struct device *d = XDEVICE (f->device); | |
| 3080 pos_data data; | |
| 3081 | |
| 3082 xzero (data); | |
| 3083 data.d = d; | |
| 3084 data.window = window; | |
| 3085 data.db = db; | |
| 3086 data.dl = dl; | |
| 3087 data.pixpos = start; | |
| 3088 data.cursor_type = NO_CURSOR; | |
| 3089 data.cursor_x = -1; | |
| 3090 data.last_charset = Qunbound; | |
| 3091 data.last_findex = DEFAULT_INDEX; | |
| 3092 data.result_str = Qnil; | |
| 3093 data.string = Qnil; | |
| 3094 data.new_ascent = dl->ascent; | |
| 3095 data.new_descent = dl->descent; | |
| 428 | 3096 |
| 3097 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS) | |
| 3098 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS)) | |
| 3099 { | |
| 3100 reverse = 1; | |
| 3101 elt = Dynarr_length (gbd) - 1; | |
| 3102 end = 0; | |
| 3103 } | |
| 3104 else | |
| 3105 { | |
| 3106 reverse = 0; | |
| 3107 elt = 0; | |
| 3108 end = Dynarr_length (gbd); | |
| 3109 } | |
| 3110 | |
| 3111 while (count && ((!reverse && elt < end) || (reverse && elt >= end))) | |
| 3112 { | |
| 3113 struct glyph_block *gb = Dynarr_atp (gbd, elt); | |
| 3114 | |
| 3115 if (NILP (gb->extent)) | |
| 2500 | 3116 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3117 |
| 3118 if (gb->active && | |
| 3119 ((side == LEFT_GLYPHS && | |
| 3120 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout) | |
| 3121 || (side == RIGHT_GLYPHS && | |
| 3122 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout))) | |
| 3123 { | |
| 442 | 3124 data.findex = gb->findex; |
| 3125 data.max_pixpos = data.pixpos + gb->width; | |
| 3126 add_glyph_rune (&data, gb, side, 0, NULL); | |
| 428 | 3127 count--; |
| 3128 gb->active = 0; | |
| 3129 } | |
| 3130 | |
| 3131 (reverse ? elt-- : elt++); | |
| 3132 } | |
| 3133 | |
| 819 | 3134 calculate_baseline (&data); |
| 442 | 3135 |
| 3136 dl->ascent = data.new_ascent; | |
| 3137 dl->descent = data.new_descent; | |
| 3138 | |
| 819 | 3139 calculate_yoffset (dl, data.db); |
| 3140 | |
| 442 | 3141 return data.pixpos; |
| 428 | 3142 } |
| 3143 | |
| 3144 /* Add a blank to a margin display block. */ | |
| 3145 | |
| 3146 static void | |
| 2286 | 3147 add_margin_blank (struct display_line *UNUSED (dl), struct display_block *db, |
| 428 | 3148 struct window *w, int xpos, int width, int side) |
| 3149 { | |
| 3150 struct rune rb; | |
| 3151 | |
| 3152 rb.findex = (side == LEFT_GLYPHS | |
| 3153 ? get_builtin_face_cache_index (w, Vleft_margin_face) | |
| 3154 : get_builtin_face_cache_index (w, Vright_margin_face)); | |
| 3155 rb.xpos = xpos; | |
| 3156 rb.width = width; | |
| 826 | 3157 rb.charpos = -1; |
| 428 | 3158 rb.endpos = 0; |
| 3159 rb.type = RUNE_BLANK; | |
| 3160 rb.cursor_type = CURSOR_OFF; | |
| 3161 | |
| 3162 Dynarr_add (db->runes, rb); | |
| 3163 } | |
| 3164 | |
| 3165 /* Display glyphs in the left outside margin, left inside margin and | |
| 3166 left whitespace area. */ | |
| 3167 | |
| 3168 static void | |
| 3169 create_left_glyph_block (struct window *w, struct display_line *dl, | |
| 3170 int overlay_width) | |
| 3171 { | |
| 3172 Lisp_Object window; | |
| 3173 | |
| 3174 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1); | |
| 3175 int elt, end_xpos; | |
| 3176 int out_end, in_out_start, in_in_end, white_out_start, white_in_start; | |
| 3177 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt; | |
| 3178 int left_in_start = dl->bounds.left_in; | |
| 3179 int left_in_end = dl->bounds.left_in + overlay_width; | |
| 3180 | |
| 3181 struct display_block *odb, *idb; | |
| 3182 | |
| 793 | 3183 window = wrap_window (w); |
| 428 | 3184 |
| 3185 /* We have to add the glyphs to the line in the order outside, | |
| 3186 inside, whitespace. However the precedence dictates that we | |
| 3187 determine how many will fit in the reverse order. */ | |
| 3188 | |
| 3189 /* Determine how many whitespace glyphs we can display and where | |
| 3190 they should start. */ | |
| 3191 white_in_start = dl->bounds.left_white; | |
| 3192 white_out_start = left_in_start; | |
| 3193 white_out_cnt = white_in_cnt = 0; | |
| 3194 elt = 0; | |
| 3195 | |
| 3196 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3197 { | |
| 3198 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3199 | |
| 3200 if (NILP (gb->extent)) | |
| 2500 | 3201 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3202 |
| 3203 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE) | |
| 3204 { | |
| 3205 int width; | |
| 3206 | |
| 438 | 3207 width = glyph_width (gb->glyph, window); |
| 428 | 3208 |
| 3209 if (white_in_start - width >= left_in_end) | |
| 3210 { | |
| 3211 white_in_cnt++; | |
| 3212 white_in_start -= width; | |
| 3213 gb->width = width; | |
| 3214 gb->active = 1; | |
| 3215 } | |
| 3216 else if (use_overflow | |
| 3217 && (white_out_start - width > dl->bounds.left_out)) | |
| 3218 { | |
| 3219 white_out_cnt++; | |
| 3220 white_out_start -= width; | |
| 3221 gb->width = width; | |
| 3222 gb->active = 1; | |
| 3223 } | |
| 3224 else | |
| 3225 gb->active = 0; | |
| 3226 } | |
| 3227 | |
| 3228 elt++; | |
| 3229 } | |
| 3230 | |
| 3231 /* Determine how many inside margin glyphs we can display and where | |
| 3232 they should start. The inside margin glyphs get whatever space | |
| 3233 is left after the whitespace glyphs have been displayed. These | |
| 3234 are tricky to calculate since if we decide to use the overflow | |
| 3235 area we basically have to start over. So for these we build up a | |
| 3236 list of just the inside margin glyphs and manipulate it to | |
| 3237 determine the needed info. */ | |
| 3238 { | |
| 3239 glyph_block_dynarr *ib; | |
| 3240 int avail_in, avail_out; | |
| 3241 int done = 0; | |
| 3242 int marker = 0; | |
| 3243 int used_in, used_out; | |
| 3244 | |
| 3245 elt = 0; | |
| 3246 used_in = used_out = 0; | |
| 3247 ib = Dynarr_new (glyph_block); | |
| 3248 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3249 { | |
| 3250 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3251 | |
| 3252 if (NILP (gb->extent)) | |
| 2500 | 3253 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3254 |
| 3255 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == | |
| 3256 GL_INSIDE_MARGIN) | |
| 3257 { | |
| 438 | 3258 gb->width = glyph_width (gb->glyph, window); |
| 428 | 3259 used_in += gb->width; |
| 3260 Dynarr_add (ib, *gb); | |
| 3261 } | |
| 3262 | |
| 3263 elt++; | |
| 3264 } | |
| 3265 | |
| 3266 if (white_out_cnt) | |
| 3267 avail_in = 0; | |
| 3268 else | |
| 3269 { | |
| 3270 avail_in = white_in_start - left_in_end; | |
| 3271 if (avail_in < 0) | |
| 3272 avail_in = 0; | |
| 3273 } | |
| 3274 | |
| 3275 if (!use_overflow) | |
| 3276 avail_out = 0; | |
| 3277 else | |
| 3278 avail_out = white_out_start - dl->bounds.left_out; | |
| 3279 | |
| 3280 marker = 0; | |
| 3281 while (!done && marker < Dynarr_length (ib)) | |
| 3282 { | |
| 3283 int width = Dynarr_atp (ib, marker)->width; | |
| 3284 | |
| 3285 /* If everything now fits in the available inside margin | |
| 4187 | 3286 space, we're done. */ |
| 428 | 3287 if (used_in <= avail_in) |
| 3288 done = 1; | |
| 3289 else | |
| 3290 { | |
| 3291 /* Otherwise see if we have room to move a glyph to the | |
| 4187 | 3292 outside. */ |
| 428 | 3293 if (used_out + width <= avail_out) |
| 3294 { | |
| 3295 used_out += width; | |
| 3296 used_in -= width; | |
| 3297 } | |
| 3298 else | |
| 3299 done = 1; | |
| 3300 } | |
| 3301 | |
| 3302 if (!done) | |
| 3303 marker++; | |
| 3304 } | |
| 3305 | |
| 3306 /* At this point we now know that everything from marker on goes in | |
| 3307 the inside margin and everything before it goes in the outside | |
| 3308 margin. The stuff going into the outside margin is guaranteed | |
| 3309 to fit, but we may have to trim some stuff from the inside. */ | |
| 3310 | |
| 3311 in_in_end = left_in_end; | |
| 3312 in_out_start = white_out_start; | |
| 3313 in_out_cnt = in_in_cnt = 0; | |
| 3314 | |
| 3315 Dynarr_free (ib); | |
| 3316 elt = 0; | |
| 3317 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3318 { | |
| 3319 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3320 | |
| 3321 if (NILP (gb->extent)) | |
| 2500 | 3322 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3323 |
| 3324 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == | |
| 3325 GL_INSIDE_MARGIN) | |
| 3326 { | |
| 438 | 3327 int width = glyph_width (gb->glyph, window); |
| 428 | 3328 |
| 3329 if (used_out) | |
| 3330 { | |
| 3331 in_out_cnt++; | |
| 3332 in_out_start -= width; | |
| 3333 gb->width = width; | |
| 3334 gb->active = 1; | |
| 3335 used_out -= width; | |
| 3336 } | |
| 3337 else if (in_in_end + width < white_in_start) | |
| 3338 { | |
| 3339 in_in_cnt++; | |
| 3340 in_in_end += width; | |
| 3341 gb->width = width; | |
| 3342 gb->active = 1; | |
| 3343 } | |
| 3344 else | |
| 3345 gb->active = 0; | |
| 3346 } | |
| 3347 | |
| 3348 elt++; | |
| 3349 } | |
| 3350 } | |
| 3351 | |
| 3352 /* Determine how many outside margin glyphs we can display. They | |
| 3353 always start at the left outside margin and can only use the | |
| 3354 outside margin space. */ | |
| 3355 out_end = dl->bounds.left_out; | |
| 3356 out_cnt = 0; | |
| 3357 elt = 0; | |
| 3358 | |
| 3359 while (elt < Dynarr_length (dl->left_glyphs)) | |
| 3360 { | |
| 3361 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt); | |
| 3362 | |
| 3363 if (NILP (gb->extent)) | |
| 2500 | 3364 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3365 |
| 3366 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == | |
| 3367 GL_OUTSIDE_MARGIN) | |
| 3368 { | |
| 438 | 3369 int width = glyph_width (gb->glyph, window); |
| 428 | 3370 |
| 3371 if (out_end + width <= in_out_start) | |
| 3372 { | |
| 3373 out_cnt++; | |
| 3374 out_end += width; | |
| 3375 gb->width = width; | |
| 3376 gb->active = 1; | |
| 3377 } | |
| 3378 else | |
| 3379 gb->active = 0; | |
| 3380 } | |
| 3381 | |
| 3382 elt++; | |
| 3383 } | |
| 3384 | |
| 3385 /* Now that we know where everything goes, we add the glyphs as | |
| 3386 runes to the appropriate display blocks. */ | |
| 3387 if (out_cnt || in_out_cnt || white_out_cnt) | |
| 3388 { | |
| 3389 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN); | |
| 3390 odb->start_pos = dl->bounds.left_out; | |
| 3391 /* #### We should stop adding a blank to account for the space | |
| 4187 | 3392 between the end of the glyphs and the margin and instead set |
| 3393 this accordingly. */ | |
| 428 | 3394 odb->end_pos = dl->bounds.left_in; |
| 3395 Dynarr_reset (odb->runes); | |
| 3396 } | |
| 3397 else | |
| 3398 odb = 0; | |
| 3399 | |
| 3400 if (in_in_cnt || white_in_cnt) | |
| 3401 { | |
| 3402 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN); | |
| 3403 idb->start_pos = dl->bounds.left_in; | |
| 3404 /* #### See above comment for odb->end_pos */ | |
| 3405 idb->end_pos = dl->bounds.left_white; | |
| 3406 Dynarr_reset (idb->runes); | |
| 3407 } | |
| 3408 else | |
| 3409 idb = 0; | |
| 3410 | |
| 3411 /* First add the outside margin glyphs. */ | |
| 3412 if (out_cnt) | |
| 3413 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt, | |
| 3414 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window); | |
| 3415 else | |
| 3416 end_xpos = dl->bounds.left_out; | |
| 3417 | |
| 3418 /* There may be blank space between the outside margin glyphs and | |
| 3419 the inside margin glyphs. If so, add a blank. */ | |
| 3420 if (in_out_cnt && (in_out_start - end_xpos)) | |
| 3421 { | |
| 3422 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos, | |
| 3423 LEFT_GLYPHS); | |
| 3424 } | |
| 3425 | |
| 3426 /* Next add the inside margin glyphs which are actually in the | |
| 3427 outside margin. */ | |
| 3428 if (in_out_cnt) | |
| 3429 { | |
| 3430 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt, | |
| 3431 GL_INSIDE_MARGIN, LEFT_GLYPHS, window); | |
| 3432 } | |
| 3433 | |
| 3434 /* If we didn't add any inside margin glyphs to the outside margin, | |
| 3435 but are adding whitespace glyphs, then we need to add a blank | |
| 3436 here. */ | |
| 3437 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos)) | |
| 3438 { | |
| 3439 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos, | |
| 3440 LEFT_GLYPHS); | |
| 3441 } | |
| 3442 | |
| 3443 /* Next add the whitespace margin glyphs which are actually in the | |
| 3444 outside margin. */ | |
| 3445 if (white_out_cnt) | |
| 3446 { | |
| 3447 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt, | |
| 3448 GL_WHITESPACE, LEFT_GLYPHS, window); | |
| 3449 } | |
| 3450 | |
| 3451 /* We take care of clearing between the end of the glyphs and the | |
| 3452 start of the inside margin for lines which have glyphs. */ | |
| 3453 if (odb && (left_in_start - end_xpos)) | |
| 3454 { | |
| 3455 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos, | |
| 3456 LEFT_GLYPHS); | |
| 3457 } | |
| 3458 | |
| 3459 /* Next add the inside margin glyphs which are actually in the | |
| 3460 inside margin. */ | |
| 3461 if (in_in_cnt) | |
| 3462 { | |
| 3463 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt, | |
| 3464 GL_INSIDE_MARGIN, LEFT_GLYPHS, window); | |
| 3465 } | |
| 3466 else | |
| 3467 end_xpos = left_in_end; | |
| 3468 | |
| 3469 /* Make sure that the area between the end of the inside margin | |
| 3470 glyphs and the whitespace glyphs is cleared. */ | |
| 3471 if (idb && (white_in_start - end_xpos > 0)) | |
| 3472 { | |
| 3473 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos, | |
| 3474 LEFT_GLYPHS); | |
| 3475 } | |
| 3476 | |
| 3477 /* Next add the whitespace margin glyphs which are actually in the | |
| 3478 inside margin. */ | |
| 3479 if (white_in_cnt) | |
| 3480 { | |
| 3481 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE, | |
| 3482 LEFT_GLYPHS, window); | |
| 3483 } | |
| 3484 | |
| 3485 /* Whitespace glyphs always end right next to the text block so | |
| 3486 there is nothing we have to make sure is cleared after them. */ | |
| 3487 } | |
| 3488 | |
| 3489 /* Display glyphs in the right outside margin, right inside margin and | |
| 3490 right whitespace area. */ | |
| 3491 | |
| 3492 static void | |
| 3493 create_right_glyph_block (struct window *w, struct display_line *dl) | |
| 3494 { | |
| 3495 Lisp_Object window; | |
| 3496 | |
| 3497 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1); | |
| 3498 int elt, end_xpos; | |
| 3499 int out_start, in_out_end, in_in_start, white_out_end, white_in_end; | |
| 3500 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt; | |
| 3501 | |
| 3502 struct display_block *odb, *idb; | |
| 3503 | |
| 793 | 3504 window = wrap_window (w); |
| 428 | 3505 |
| 3506 /* We have to add the glyphs to the line in the order outside, | |
| 3507 inside, whitespace. However the precedence dictates that we | |
| 3508 determine how many will fit in the reverse order. */ | |
| 3509 | |
| 3510 /* Determine how many whitespace glyphs we can display and where | |
| 3511 they should start. */ | |
| 3512 white_in_end = dl->bounds.right_white; | |
| 3513 white_out_end = dl->bounds.right_in; | |
| 3514 white_out_cnt = white_in_cnt = 0; | |
| 3515 elt = 0; | |
| 3516 | |
| 3517 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3518 { | |
| 3519 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3520 | |
| 3521 if (NILP (gb->extent)) | |
| 2500 | 3522 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3523 |
| 3524 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE) | |
| 3525 { | |
| 438 | 3526 int width = glyph_width (gb->glyph, window); |
| 428 | 3527 |
| 3528 if (white_in_end + width <= dl->bounds.right_in) | |
| 3529 { | |
| 3530 white_in_cnt++; | |
| 3531 white_in_end += width; | |
| 3532 gb->width = width; | |
| 3533 gb->active = 1; | |
| 3534 } | |
| 3535 else if (use_overflow | |
| 3536 && (white_out_end + width <= dl->bounds.right_out)) | |
| 3537 { | |
| 3538 white_out_cnt++; | |
| 3539 white_out_end += width; | |
| 3540 gb->width = width; | |
| 3541 gb->active = 1; | |
| 3542 } | |
| 3543 else | |
| 3544 gb->active = 0; | |
| 3545 } | |
| 3546 | |
| 3547 elt++; | |
| 3548 } | |
| 3549 | |
| 3550 /* Determine how many inside margin glyphs we can display and where | |
| 3551 they should start. The inside margin glyphs get whatever space | |
| 3552 is left after the whitespace glyphs have been displayed. These | |
| 3553 are tricky to calculate since if we decide to use the overflow | |
| 3554 area we basically have to start over. So for these we build up a | |
| 3555 list of just the inside margin glyphs and manipulate it to | |
| 3556 determine the needed info. */ | |
| 3557 { | |
| 3558 glyph_block_dynarr *ib; | |
| 3559 int avail_in, avail_out; | |
| 3560 int done = 0; | |
| 3561 int marker = 0; | |
| 3562 int used_in, used_out; | |
| 3563 | |
| 3564 elt = 0; | |
| 3565 used_in = used_out = 0; | |
| 3566 ib = Dynarr_new (glyph_block); | |
| 3567 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3568 { | |
| 3569 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3570 | |
| 3571 if (NILP (gb->extent)) | |
| 2500 | 3572 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3573 |
| 3574 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN) | |
| 3575 { | |
| 438 | 3576 gb->width = glyph_width (gb->glyph, window); |
| 428 | 3577 used_in += gb->width; |
| 3578 Dynarr_add (ib, *gb); | |
| 3579 } | |
| 3580 | |
| 3581 elt++; | |
| 3582 } | |
| 3583 | |
| 3584 if (white_out_cnt) | |
| 3585 avail_in = 0; | |
| 3586 else | |
| 3587 avail_in = dl->bounds.right_in - white_in_end; | |
| 3588 | |
| 3589 if (!use_overflow) | |
| 3590 avail_out = 0; | |
| 3591 else | |
| 3592 avail_out = dl->bounds.right_out - white_out_end; | |
| 3593 | |
| 3594 marker = 0; | |
| 3595 while (!done && marker < Dynarr_length (ib)) | |
| 3596 { | |
| 3597 int width = Dynarr_atp (ib, marker)->width; | |
| 3598 | |
| 3599 /* If everything now fits in the available inside margin | |
| 4187 | 3600 space, we're done. */ |
| 428 | 3601 if (used_in <= avail_in) |
| 3602 done = 1; | |
| 3603 else | |
| 3604 { | |
| 3605 /* Otherwise see if we have room to move a glyph to the | |
| 4187 | 3606 outside. */ |
| 428 | 3607 if (used_out + width <= avail_out) |
| 3608 { | |
| 3609 used_out += width; | |
| 3610 used_in -= width; | |
| 3611 } | |
| 3612 else | |
| 3613 done = 1; | |
| 3614 } | |
| 3615 | |
| 3616 if (!done) | |
| 3617 marker++; | |
| 3618 } | |
| 3619 | |
| 3620 /* At this point we now know that everything from marker on goes in | |
| 3621 the inside margin and everything before it goes in the outside | |
| 3622 margin. The stuff going into the outside margin is guaranteed | |
| 3623 to fit, but we may have to trim some stuff from the inside. */ | |
| 3624 | |
| 3625 in_in_start = dl->bounds.right_in; | |
| 3626 in_out_end = dl->bounds.right_in; | |
| 3627 in_out_cnt = in_in_cnt = 0; | |
| 3628 | |
| 3629 Dynarr_free (ib); | |
| 3630 elt = 0; | |
| 3631 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3632 { | |
| 3633 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3634 | |
| 3635 if (NILP (gb->extent)) | |
| 2500 | 3636 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3637 |
| 3638 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN) | |
| 3639 { | |
| 438 | 3640 int width = glyph_width (gb->glyph, window); |
| 428 | 3641 |
| 3642 if (used_out) | |
| 3643 { | |
| 3644 in_out_cnt++; | |
| 3645 in_out_end += width; | |
| 3646 gb->width = width; | |
| 3647 gb->active = 1; | |
| 3648 used_out -= width; | |
| 3649 } | |
| 3650 else if (in_in_start - width >= white_in_end) | |
| 3651 { | |
| 3652 in_in_cnt++; | |
| 3653 in_in_start -= width; | |
| 3654 gb->width = width; | |
| 3655 gb->active = 1; | |
| 3656 } | |
| 3657 else | |
| 3658 gb->active = 0; | |
| 3659 } | |
| 3660 | |
| 3661 elt++; | |
| 3662 } | |
| 3663 } | |
| 3664 | |
| 3665 /* Determine how many outside margin glyphs we can display. They | |
| 3666 always start at the right outside margin and can only use the | |
| 3667 outside margin space. */ | |
| 3668 out_start = dl->bounds.right_out; | |
| 3669 out_cnt = 0; | |
| 3670 elt = 0; | |
| 3671 | |
| 3672 while (elt < Dynarr_length (dl->right_glyphs)) | |
| 3673 { | |
| 3674 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt); | |
| 3675 | |
| 3676 if (NILP (gb->extent)) | |
| 2500 | 3677 ABORT (); /* these should have been handled in add_glyph_rune */ |
| 428 | 3678 |
| 3679 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN) | |
| 3680 { | |
| 438 | 3681 int width = glyph_width (gb->glyph, window); |
| 428 | 3682 |
| 3683 if (out_start - width >= in_out_end) | |
| 3684 { | |
| 3685 out_cnt++; | |
| 3686 out_start -= width; | |
| 3687 gb->width = width; | |
| 3688 gb->active = 1; | |
| 3689 } | |
| 3690 else | |
| 3691 gb->active = 0; | |
| 3692 } | |
| 3693 | |
| 3694 elt++; | |
| 3695 } | |
| 3696 | |
| 3697 /* Now that we now where everything goes, we add the glyphs as runes | |
| 3698 to the appropriate display blocks. */ | |
| 3699 if (out_cnt || in_out_cnt || white_out_cnt) | |
| 3700 { | |
| 3701 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN); | |
| 3702 /* #### See comments before odb->start_pos init in | |
| 4187 | 3703 create_left_glyph_block */ |
| 428 | 3704 odb->start_pos = dl->bounds.right_in; |
| 3705 odb->end_pos = dl->bounds.right_out; | |
| 3706 Dynarr_reset (odb->runes); | |
| 3707 } | |
| 3708 else | |
| 3709 odb = 0; | |
| 3710 | |
| 3711 if (in_in_cnt || white_in_cnt) | |
| 3712 { | |
| 3713 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN); | |
| 3714 idb->start_pos = dl->bounds.right_white; | |
| 3715 /* #### See comments before odb->start_pos init in | |
| 4187 | 3716 create_left_glyph_block */ |
| 428 | 3717 idb->end_pos = dl->bounds.right_in; |
| 3718 Dynarr_reset (idb->runes); | |
| 3719 } | |
| 3720 else | |
| 3721 idb = 0; | |
| 3722 | |
| 3723 /* First add the whitespace margin glyphs which are actually in the | |
| 3724 inside margin. */ | |
| 3725 if (white_in_cnt) | |
| 3726 { | |
| 3727 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white, | |
| 3728 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS, | |
| 3729 window); | |
| 3730 } | |
| 3731 else | |
| 3732 end_xpos = dl->bounds.right_white; | |
| 3733 | |
| 3734 /* Make sure that the area between the end of the whitespace glyphs | |
| 3735 and the inside margin glyphs is cleared. */ | |
| 3736 if (in_in_cnt && (in_in_start - end_xpos)) | |
| 3737 { | |
| 3738 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos, | |
| 3739 RIGHT_GLYPHS); | |
| 3740 } | |
| 3741 | |
| 3742 /* Next add the inside margin glyphs which are actually in the | |
| 3743 inside margin. */ | |
| 3744 if (in_in_cnt) | |
| 3745 { | |
| 3746 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt, | |
| 3747 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window); | |
| 3748 } | |
| 3749 | |
| 3750 /* If we didn't add any inside margin glyphs then make sure the rest | |
| 3751 of the inside margin area gets cleared. */ | |
| 3752 if (idb && (dl->bounds.right_in - end_xpos)) | |
| 3753 { | |
| 3754 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos, | |
| 3755 RIGHT_GLYPHS); | |
| 3756 } | |
| 3757 | |
| 3758 /* Next add any whitespace glyphs in the outside margin. */ | |
| 3759 if (white_out_cnt) | |
| 3760 { | |
| 3761 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt, | |
| 3762 GL_WHITESPACE, RIGHT_GLYPHS, window); | |
| 3763 } | |
| 3764 else | |
| 3765 end_xpos = dl->bounds.right_in; | |
| 3766 | |
| 3767 /* Next add any inside margin glyphs in the outside margin. */ | |
| 3768 if (in_out_cnt) | |
| 3769 { | |
| 3770 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt, | |
| 3771 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window); | |
| 3772 } | |
| 3773 | |
| 3774 /* There may be space between any whitespace or inside margin glyphs | |
| 3775 in the outside margin and the actual outside margin glyphs. */ | |
| 3776 if (odb && (out_start - end_xpos)) | |
| 3777 { | |
| 3778 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos, | |
| 3779 RIGHT_GLYPHS); | |
| 3780 } | |
| 3781 | |
| 3782 /* Finally, add the outside margin glyphs. */ | |
| 3783 if (out_cnt) | |
| 3784 { | |
| 3785 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN, | |
| 3786 RIGHT_GLYPHS, window); | |
| 3787 } | |
| 3788 } | |
| 3789 | |
| 3790 | |
| 3791 /***************************************************************************/ | |
| 3792 /* */ | |
| 3793 /* modeline routines */ | |
| 3794 /* */ | |
| 3795 /***************************************************************************/ | |
| 3796 | |
| 438 | 3797 /* This function is also used in frame.c by `generate_title_string' */ |
| 3798 void | |
| 3799 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str, | |
| 4187 | 3800 struct window *w, struct display_line *dl, |
| 3801 struct display_block *db, face_index findex, | |
| 3802 int min_pixpos, int max_pixpos, int type) | |
| 438 | 3803 { |
| 3804 struct frame *f = XFRAME (w->frame); | |
| 3805 struct device *d = XDEVICE (f->device); | |
| 3806 | |
| 3807 pos_data data; | |
| 3808 int c_pixpos; | |
| 3809 Charcount offset = 0; | |
| 3810 | |
| 3811 xzero (data); | |
| 3812 data.d = d; | |
| 3813 data.db = db; | |
| 3814 data.dl = dl; | |
| 3815 data.findex = findex; | |
| 3816 data.pixpos = min_pixpos; | |
| 3817 data.max_pixpos = max_pixpos; | |
| 3818 data.cursor_type = NO_CURSOR; | |
| 3819 data.last_charset = Qunbound; | |
| 3820 data.last_findex = DEFAULT_INDEX; | |
| 3821 data.result_str = result_str; | |
| 3822 data.is_modeline = 1; | |
| 3823 data.string = Qnil; | |
| 793 | 3824 data.window = wrap_window (w); |
| 438 | 3825 |
| 3826 Dynarr_reset (formatted_string_extent_dynarr); | |
| 3827 Dynarr_reset (formatted_string_extent_start_dynarr); | |
| 3828 Dynarr_reset (formatted_string_extent_end_dynarr); | |
| 3829 | |
| 3830 /* result_str is nil when we're building a frame or icon title. Otherwise, | |
| 3831 we're building a modeline, so the offset starts at the modeline | |
| 442 | 3832 horizontal scrolling amount */ |
| 438 | 3833 if (! NILP (result_str)) |
| 3834 offset = w->modeline_hscroll; | |
| 3835 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0, | |
| 4187 | 3836 max_pixpos - min_pixpos, findex, type, &offset, |
| 438 | 3837 Qnil); |
| 3838 | |
| 3839 if (Dynarr_length (db->runes)) | |
| 3840 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3841 struct rune *rb = Dynarr_lastp (db->runes); |
| 438 | 3842 c_pixpos = rb->xpos + rb->width; |
| 3843 } | |
| 3844 else | |
| 3845 c_pixpos = min_pixpos; | |
| 3846 | |
| 3847 /* If we don't reach the right side of the window, add a blank rune | |
| 3848 to make up the difference. This usually only occurs if the | |
| 3849 modeline face is using a proportional width font or a fixed width | |
| 3850 font of a different size from the default face font. */ | |
| 3851 | |
| 3852 if (c_pixpos < max_pixpos) | |
| 3853 { | |
| 3854 data.pixpos = c_pixpos; | |
| 3855 data.blank_width = max_pixpos - data.pixpos; | |
| 3856 | |
| 3857 add_blank_rune (&data, NULL, 0); | |
| 3858 } | |
| 3859 | |
| 3860 /* Now create the result string and frob the extents into it. */ | |
| 3861 if (!NILP (result_str)) | |
| 3862 { | |
| 3863 int elt; | |
| 3864 Bytecount len; | |
| 867 | 3865 Ibyte *strdata; |
| 438 | 3866 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w)); |
| 3867 | |
| 442 | 3868 in_modeline_generation = 1; |
| 3869 | |
| 771 | 3870 sledgehammer_check_ascii_begin (result_str); |
| 438 | 3871 detach_all_extents (result_str); |
| 793 | 3872 resize_string (result_str, -1, |
| 4187 | 3873 data.bytepos - XSTRING_LENGTH (result_str)); |
| 438 | 3874 |
| 3875 strdata = XSTRING_DATA (result_str); | |
| 3876 | |
| 3877 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
|
3878 { |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3879 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
|
3880 { |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3881 len += (set_itext_ichar |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3882 (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
|
3883 elt)->object.chr.ch)); |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3884 } |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
3885 } |
| 438 | 3886 |
| 771 | 3887 init_string_ascii_begin (result_str); |
| 3888 bump_string_modiff (result_str); | |
| 3889 sledgehammer_check_ascii_begin (result_str); | |
| 3890 | |
| 438 | 3891 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr); |
| 4187 | 3892 elt++) |
| 3893 { | |
| 3894 Lisp_Object extent = Qnil; | |
| 3895 Lisp_Object child; | |
| 3896 | |
| 3897 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt)); | |
| 3898 child = Fgethash (extent, buf->modeline_extent_table, Qnil); | |
| 3899 if (NILP (child)) | |
| 3900 { | |
| 3901 child = Fmake_extent (Qnil, Qnil, result_str); | |
| 3902 Fputhash (extent, child, buf->modeline_extent_table); | |
| 3903 } | |
| 3904 Fset_extent_parent (child, extent); | |
| 3905 set_extent_endpoints | |
| 3906 (XEXTENT (child), | |
| 3907 Dynarr_at (formatted_string_extent_start_dynarr, elt), | |
| 3908 Dynarr_at (formatted_string_extent_end_dynarr, elt), | |
| 3909 result_str); | |
| 3910 } | |
| 442 | 3911 |
| 3912 in_modeline_generation = 0; | |
| 438 | 3913 } |
| 3914 } | |
| 3915 | |
| 428 | 3916 /* Ensure that the given display line DL accurately represents the |
| 3917 modeline for the given window. */ | |
| 3918 static void | |
| 3919 generate_modeline (struct window *w, struct display_line *dl, int type) | |
| 3920 { | |
| 3921 struct buffer *b = XBUFFER (w->buffer); | |
| 3922 struct frame *f = XFRAME (w->frame); | |
| 3923 struct device *d = XDEVICE (f->device); | |
| 3924 | |
| 3925 /* Unlike display line and rune pointers, this one can't change underneath | |
| 3926 our feet. */ | |
| 3927 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 3928 int max_pixpos, min_pixpos, ypos_adj; | |
| 3929 Lisp_Object font_inst; | |
| 3930 | |
| 3931 /* This will actually determine incorrect inside boundaries for the | |
| 3932 modeline since it ignores the margins. However being aware of this fact | |
| 3933 we never use those values anywhere so it doesn't matter. */ | |
| 3934 dl->bounds = calculate_display_line_boundaries (w, 1); | |
| 3935 | |
| 3936 /* We are generating a modeline. */ | |
| 3937 dl->modeline = 1; | |
| 3938 dl->cursor_elt = -1; | |
| 3939 | |
| 3940 /* Reset the runes on the modeline. */ | |
| 3941 Dynarr_reset (db->runes); | |
| 3942 | |
| 3943 if (!WINDOW_HAS_MODELINE_P (w)) | |
| 3944 { | |
| 3945 struct rune rb; | |
| 3946 | |
| 3947 /* If there is a horizontal scrollbar, don't add anything. */ | |
| 3948 if (window_scrollbar_height (w)) | |
| 3949 return; | |
| 3950 | |
| 3951 dl->ascent = DEVMETH (d, divider_height, ()); | |
| 3952 dl->descent = 0; | |
| 3953 /* The modeline is at the bottom of the gutters. */ | |
| 3954 dl->ypos = WINDOW_BOTTOM (w); | |
| 3955 | |
| 3956 rb.findex = MODELINE_INDEX; | |
| 3957 rb.xpos = dl->bounds.left_out; | |
| 3958 rb.width = dl->bounds.right_out - dl->bounds.left_out; | |
| 826 | 3959 rb.charpos = 0; |
| 428 | 3960 rb.endpos = 0; |
| 3961 rb.type = RUNE_HLINE; | |
| 3962 rb.object.hline.thickness = 1; | |
| 3963 rb.object.hline.yoffset = 0; | |
| 3964 rb.cursor_type = NO_CURSOR; | |
| 3965 | |
| 3966 if (!EQ (Qzero, w->modeline_shadow_thickness) | |
| 3967 && FRAME_WIN_P (f)) | |
| 3968 { | |
| 3969 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w); | |
| 3970 | |
| 3971 dl->ypos -= shadow_thickness; | |
| 3972 rb.xpos += shadow_thickness; | |
| 3973 rb.width -= 2 * shadow_thickness; | |
| 3974 } | |
| 3975 | |
| 3976 Dynarr_add (db->runes, rb); | |
| 3977 return; | |
| 3978 } | |
| 3979 | |
| 3980 /* !!#### not right; needs to compute the max height of | |
| 3981 all the charsets */ | |
| 3982 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii); | |
| 3983 | |
| 3984 dl->ascent = XFONT_INSTANCE (font_inst)->ascent; | |
| 3985 dl->descent = XFONT_INSTANCE (font_inst)->descent; | |
| 3986 | |
| 3987 min_pixpos = dl->bounds.left_out; | |
| 3988 max_pixpos = dl->bounds.right_out; | |
| 3989 | |
| 3990 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f)) | |
| 3991 { | |
| 3992 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w); | |
| 3993 | |
| 3994 ypos_adj = shadow_thickness; | |
| 3995 min_pixpos += shadow_thickness; | |
| 3996 max_pixpos -= shadow_thickness; | |
| 3997 } | |
| 3998 else | |
| 3999 ypos_adj = 0; | |
| 4000 | |
| 4001 generate_formatted_string_db (b->modeline_format, | |
| 4002 b->generated_modeline_string, w, dl, db, | |
| 4003 MODELINE_INDEX, min_pixpos, max_pixpos, type); | |
| 4004 | |
| 4005 /* The modeline is at the bottom of the gutters. We have to wait to | |
| 4006 set this until we've generated the modeline in order to account | |
| 4007 for any embedded faces. */ | |
| 4008 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj; | |
| 4009 } | |
| 4010 | |
| 4011 static Charcount | |
| 867 | 4012 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str, |
| 4187 | 4013 Charcount pos, Charcount min_pos, |
| 771 | 4014 Charcount max_pos) |
| 428 | 4015 { |
| 4016 /* This function has been Mule-ized. */ | |
| 4017 Charcount end; | |
| 867 | 4018 const Ibyte *cur_pos = str; |
| 428 | 4019 struct display_block *db = data->db; |
| 4020 | |
| 4021 data->blank_width = space_width (XWINDOW (data->window)); | |
| 4022 while (Dynarr_length (db->runes) < pos) | |
| 4023 add_blank_rune (data, NULL, 0); | |
| 4024 | |
| 4025 end = (Dynarr_length (db->runes) + | |
| 4970 | 4026 bytecount_to_charcount (str, qxestrlen (str))); |
| 428 | 4027 if (max_pos != -1) |
| 4028 end = min (max_pos, end); | |
| 4029 | |
| 4030 while (pos < end && *cur_pos) | |
| 4031 { | |
| 867 | 4032 const Ibyte *old_cur_pos = cur_pos; |
| 428 | 4033 int succeeded; |
| 4034 | |
| 867 | 4035 data->ch = itext_ichar (cur_pos); |
| 4036 succeeded = (add_ichar_rune (data) != ADD_FAILED); | |
| 4037 INC_IBYTEPTR (cur_pos); | |
| 428 | 4038 if (succeeded) |
| 4187 | 4039 { |
| 4040 pos++; | |
| 4041 data->modeline_charpos++; | |
| 4042 data->bytepos += cur_pos - old_cur_pos; | |
| 4043 } | |
| 428 | 4044 } |
| 4045 | |
| 4046 while (Dynarr_length (db->runes) < min_pos && | |
| 4187 | 4047 (data->pixpos + data->blank_width <= data->max_pixpos)) |
| 428 | 4048 add_blank_rune (data, NULL, 0); |
| 4049 | |
| 4050 return Dynarr_length (db->runes); | |
| 4051 } | |
| 4052 | |
| 4053 /* #### Urk! Should also handle begin-glyphs and end-glyphs in | |
| 4054 modeline extents. */ | |
| 4055 static Charcount | |
| 4056 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph, | |
| 4187 | 4057 Charcount pos, Charcount UNUSED (min_pos), |
| 438 | 4058 Charcount max_pos, Lisp_Object extent) |
| 428 | 4059 { |
| 4060 /* This function has been Mule-ized. */ | |
| 4061 Charcount end; | |
| 4062 struct display_block *db = data->db; | |
| 4063 struct glyph_block gb; | |
| 4064 | |
| 4065 data->blank_width = space_width (XWINDOW (data->window)); | |
| 4066 while (Dynarr_length (db->runes) < pos) | |
| 4067 add_blank_rune (data, NULL, 0); | |
| 4068 | |
| 4069 end = Dynarr_length (db->runes) + 1; | |
| 4070 if (max_pos != -1) | |
| 4071 end = min (max_pos, end); | |
| 4072 | |
| 4073 gb.glyph = glyph; | |
| 438 | 4074 gb.extent = extent; |
| 428 | 4075 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0); |
| 4076 pos++; | |
| 4077 | |
| 4078 while (Dynarr_length (db->runes) < pos && | |
| 4187 | 4079 (data->pixpos + data->blank_width <= data->max_pixpos)) |
| 428 | 4080 add_blank_rune (data, NULL, 0); |
| 4081 | |
| 4082 return Dynarr_length (db->runes); | |
| 4083 } | |
| 4084 | |
| 4085 /* If max_pos is == -1, it is considered to be infinite. The same is | |
| 4086 true of max_pixsize. */ | |
| 4087 #define SET_CURRENT_MODE_CHARS_PIXSIZE \ | |
| 4088 if (Dynarr_length (data->db->runes)) \ | |
| 4967 | 4089 cur_pixsize = data->pixpos - Dynarr_begin (data->db->runes)->xpos; \ |
| 428 | 4090 else \ |
| 4091 cur_pixsize = 0; | |
| 4092 | |
| 4093 /* Note that this function does "positions" in terms of characters and | |
| 4094 not in terms of columns. This is necessary to make the formatting | |
| 4095 work correctly when proportional width fonts are used in the | |
| 4096 modeline. */ | |
| 4097 static Charcount | |
| 4098 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos, | |
| 4187 | 4099 Charcount min_pos, Charcount max_pos, |
| 4100 Lisp_Object elt, int depth, int max_pixsize, | |
| 4101 face_index findex, int type, Charcount *offset, | |
| 438 | 4102 Lisp_Object cur_ext) |
| 428 | 4103 { |
| 4104 /* This function has been Mule-ized. */ | |
| 4105 /* #### The other losing things in this function are: | |
| 4106 | |
| 4107 -- C zero-terminated-string lossage. | |
| 4108 -- Non-printable characters should be converted into something | |
| 4187 | 4109 appropriate (e.g. ^F) instead of blindly being printed anyway. |
| 428 | 4110 */ |
| 4111 | |
| 4112 tail_recurse: | |
| 4113 if (depth > 10) | |
| 4114 goto invalid; | |
| 4115 | |
| 4116 depth++; | |
| 4117 | |
| 4118 if (STRINGP (elt)) | |
| 4119 { | |
| 4120 /* A string. Add to the display line and check for %-constructs | |
| 4187 | 4121 within it. */ |
| 428 | 4122 |
| 2552 | 4123 Ibyte *this_str = XSTRING_DATA (elt); |
| 4124 | |
| 4125 while ((pos < max_pos || max_pos == -1) && *this_str) | |
| 4187 | 4126 { |
| 4127 Ibyte *last = this_str; | |
| 4128 | |
| 4129 while (*this_str && *this_str != '%') | |
| 4130 this_str++; | |
| 4131 | |
| 4132 if (this_str != last) | |
| 4133 { | |
| 4134 /* No %-construct */ | |
| 4135 Charcount size = | |
| 2552 | 4136 bytecount_to_charcount (last, this_str - last); |
| 438 | 4137 |
| 4138 if (size <= *offset) | |
| 4139 *offset -= size; | |
| 4140 else | |
| 4141 { | |
| 4142 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset : | |
| 4143 min (pos + size - *offset, max_pos)); | |
| 867 | 4144 const Ibyte *tmp_last = itext_n_addr (last, *offset); |
| 438 | 4145 |
| 4146 pos = add_string_to_fstring_db_runes (data, tmp_last, | |
| 4147 pos, pos, tmp_max); | |
| 4148 *offset = 0; | |
| 4149 } | |
| 4187 | 4150 } |
| 4151 else /* *this_str == '%' */ | |
| 4152 { | |
| 4153 Charcount spec_width = 0; | |
| 4154 | |
| 4155 this_str++; /* skip over '%' */ | |
| 4156 | |
| 4157 /* We can't allow -ve args due to the "%-" construct. | |
| 4158 * Argument specifies minwidth but not maxwidth | |
| 4159 * (maxwidth can be specified by | |
| 4160 * (<negative-number> . <stuff>) modeline elements) | |
| 4161 */ | |
| 4162 while (isdigit (*this_str)) | |
| 4163 { | |
| 4164 spec_width = spec_width * 10 + (*this_str - '0'); | |
| 4165 this_str++; | |
| 4166 } | |
| 4167 spec_width += pos; | |
| 4168 | |
| 4169 if (*this_str == 'M') | |
| 4170 { | |
| 4171 pos = generate_fstring_runes (w, data, pos, spec_width, | |
| 4172 max_pos, Vglobal_mode_string, | |
| 4173 depth, max_pixsize, findex, | |
| 4174 type, offset, cur_ext); | |
| 4175 } | |
| 4176 else if (*this_str == '-') | |
| 4177 { | |
| 4178 Charcount num_to_add; | |
| 4179 | |
| 4180 if (max_pixsize < 0) | |
| 4181 num_to_add = 0; | |
| 4182 else if (max_pos != -1) | |
| 4183 num_to_add = max_pos - pos; | |
| 4184 else | |
| 4185 { | |
| 4186 int cur_pixsize; | |
| 4187 int dash_pixsize; | |
| 4188 Ibyte ch = '-'; | |
| 4189 SET_CURRENT_MODE_CHARS_PIXSIZE; | |
| 4190 | |
| 4191 dash_pixsize = | |
|
4815
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
4192 redisplay_window_text_width_string |
|
6540302eedf5
Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents:
4528
diff
changeset
|
4193 (w, findex, &ch, Qnil, 0, 1); |
| 4187 | 4194 |
| 4195 if (dash_pixsize == 0) | |
| 3094 | 4196 num_to_add = 0; |
| 4197 else { | |
| 4198 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize; | |
| 4199 num_to_add++; | |
| 4200 } | |
| 4187 | 4201 } |
| 4202 | |
| 4203 while (num_to_add--) | |
| 4204 pos = add_string_to_fstring_db_runes | |
| 4205 (data, (const Ibyte *) "-", pos, pos, max_pos); | |
| 4206 } | |
| 4207 else if (*this_str != 0) | |
| 4208 { | |
| 4209 Ichar ch = itext_ichar (this_str); | |
| 4210 Ibyte *str; | |
| 438 | 4211 Charcount size; |
| 4212 | |
| 4187 | 4213 decode_mode_spec (w, ch, type); |
| 4214 | |
| 4967 | 4215 str = Dynarr_begin (mode_spec_ibyte_string); |
| 438 | 4216 size = bytecount_to_charcount |
| 4217 /* Skip the null character added by `decode_mode_spec' */ | |
| 867 | 4218 (str, Dynarr_length (mode_spec_ibyte_string)) - 1; |
| 438 | 4219 |
| 4220 if (size <= *offset) | |
| 4221 *offset -= size; | |
| 4222 else | |
| 4223 { | |
| 867 | 4224 const Ibyte *tmp_str = itext_n_addr (str, *offset); |
| 438 | 4225 |
| 440 | 4226 /* #### NOTE: I don't understand why a tmp_max is not |
| 438 | 4227 computed and used here as in the plain string case |
| 4228 above. -- dv */ | |
| 4229 pos = add_string_to_fstring_db_runes (data, tmp_str, | |
| 4230 pos, pos, | |
| 4231 max_pos); | |
| 4232 *offset = 0; | |
| 4233 } | |
| 4187 | 4234 } |
| 4235 | |
| 4236 /* NOT this_str++. There could be any sort of character at | |
| 4237 the current position. */ | |
| 4238 INC_IBYTEPTR (this_str); | |
| 4239 } | |
| 4240 | |
| 4241 if (max_pixsize > 0) | |
| 4242 { | |
| 4243 int cur_pixsize; | |
| 4244 SET_CURRENT_MODE_CHARS_PIXSIZE; | |
| 4245 | |
| 4246 if (cur_pixsize >= max_pixsize) | |
| 4247 break; | |
| 4248 } | |
| 4249 } | |
| 428 | 4250 } |
| 4251 else if (SYMBOLP (elt)) | |
| 4252 { | |
| 4253 /* A symbol: process the value of the symbol recursively | |
| 4187 | 4254 as if it appeared here directly. */ |
| 428 | 4255 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer); |
| 4256 | |
| 4257 if (!UNBOUNDP (tem)) | |
| 4187 | 4258 { |
| 438 | 4259 /* If value is a string, output that string literally: |
| 4187 | 4260 don't check for % within it. */ |
| 4261 if (STRINGP (tem)) | |
| 4262 { | |
| 867 | 4263 Ibyte *str = XSTRING_DATA (tem); |
| 826 | 4264 Charcount size = string_char_length (tem); |
| 438 | 4265 |
| 4266 if (size <= *offset) | |
| 4267 *offset -= size; | |
| 4268 else | |
| 4269 { | |
| 867 | 4270 const Ibyte *tmp_str = itext_n_addr (str, *offset); |
| 438 | 4271 |
| 440 | 4272 /* #### NOTE: I don't understand why a tmp_max is not |
| 438 | 4273 computed and used here as in the plain string case |
| 4274 above. -- dv */ | |
| 4275 pos = add_string_to_fstring_db_runes (data, tmp_str, pos, | |
| 4276 min_pos, max_pos); | |
| 4277 *offset = 0; | |
| 4278 } | |
| 4187 | 4279 } |
| 4280 /* Give up right away for nil or t. */ | |
| 4281 else if (!EQ (tem, elt)) | |
| 4282 { | |
| 4283 elt = tem; | |
| 4284 goto tail_recurse; | |
| 4285 } | |
| 4286 } | |
| 428 | 4287 } |
| 4288 else if (GENERIC_SPECIFIERP (elt)) | |
| 4289 { | |
| 4290 Lisp_Object window, tem; | |
| 793 | 4291 window = wrap_window (w); |
| 428 | 4292 tem = specifier_instance_no_quit (elt, Qunbound, window, |
| 793 | 4293 ERROR_ME_DEBUG_WARN, 0, Qzero); |
| 428 | 4294 if (!UNBOUNDP (tem)) |
| 4295 { | |
| 4296 elt = tem; | |
| 4297 goto tail_recurse; | |
| 4298 } | |
| 4299 } | |
| 4300 else if (CONSP (elt)) | |
| 4301 { | |
| 4302 /* A cons cell: four distinct cases. | |
| 438 | 4303 * - If first element is a string or a cons, process all the elements |
| 4304 * and effectively concatenate them. | |
| 4305 * - If first element is a negative number, truncate displaying cdr to | |
| 4306 * at most that many characters. If positive, pad (with spaces) | |
| 4307 * to at least that many characters. | |
| 771 | 4308 * - If first element is another symbol or a boolean specifier, process |
| 4309 * the cadr or caddr recursively according to whether the symbol's | |
| 4310 * value or specifier's instance is non-nil or nil. | |
| 4311 * - If first element is , process the cadr or caddr | |
| 4312 * recursively according to whether the instance of the specifier in | |
| 4313 * the modeline's window is non-nil or nil. | |
| 442 | 4314 * - If first element is an extent, process the cdr recursively |
| 4315 * and handle the extent's face. | |
| 428 | 4316 */ |
| 438 | 4317 |
| 428 | 4318 Lisp_Object car, tem; |
| 4319 | |
| 4320 car = XCAR (elt); | |
| 771 | 4321 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car)) |
| 438 | 4322 { |
| 4323 elt = XCDR (elt); | |
| 4324 if (!CONSP (elt)) | |
| 4325 goto invalid; | |
| 4326 | |
| 771 | 4327 if (SYMBOLP (car)) |
| 4328 tem = symbol_value_in_buffer (car, w->buffer); | |
| 4329 else | |
| 4330 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w), | |
| 793 | 4331 ERROR_ME_DEBUG_WARN, 0, Qzero); |
| 438 | 4332 /* elt is now the cdr, and we know it is a cons cell. |
| 4333 Use its car if CAR has a non-nil value. */ | |
| 771 | 4334 if (!UNBOUNDP (tem) && !NILP (tem)) |
| 438 | 4335 { |
| 771 | 4336 elt = XCAR (elt); |
| 4337 goto tail_recurse; | |
| 438 | 4338 } |
| 771 | 4339 /* Symbol's value or specifier's instance is nil or unbound |
| 438 | 4340 * Get the cddr of the original list |
| 4341 * and if possible find the caddr and use that. | |
| 4342 */ | |
| 4343 elt = XCDR (elt); | |
| 4344 if (NILP (elt)) | |
| 4345 ; | |
| 4346 else if (!CONSP (elt)) | |
| 4347 goto invalid; | |
| 4348 else | |
| 4349 { | |
| 4350 elt = XCAR (elt); | |
| 4351 goto tail_recurse; | |
| 4352 } | |
| 4353 } | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
4354 else if (FIXNUMP (car)) |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
4355 { |
|
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
4356 Charcount lim = XFIXNUM (car); |
| 4187 | 4357 |
| 4358 elt = XCDR (elt); | |
| 4359 | |
| 4360 if (lim < 0) | |
| 4361 { | |
| 4362 /* Negative int means reduce maximum width. | |
| 4363 * DO NOT change MIN_PIXPOS here! | |
| 4364 * (20 -10 . foo) should truncate foo to 10 col | |
| 4365 * and then pad to 20. | |
| 4366 */ | |
| 4367 if (max_pos == -1) | |
| 4368 max_pos = pos - lim; | |
| 4369 else | |
| 4370 max_pos = min (max_pos, pos - lim); | |
| 4371 } | |
| 4372 else if (lim > 0) | |
| 4373 { | |
| 4374 /* Padding specified. Don't let it be more than | |
| 4375 * current maximum. | |
| 4376 */ | |
| 4377 lim += pos; | |
| 4378 if (max_pos != -1 && lim > max_pos) | |
| 4379 lim = max_pos; | |
| 4380 /* If that's more padding than already wanted, queue it. | |
| 4381 * But don't reduce padding already specified even if | |
| 4382 * that is beyond the current truncation point. | |
| 4383 */ | |
| 4384 if (lim > min_pos) | |
| 4385 min_pos = lim; | |
| 4386 } | |
| 4387 goto tail_recurse; | |
| 4388 } | |
| 428 | 4389 else if (STRINGP (car) || CONSP (car)) |
| 4187 | 4390 { |
| 4391 int limit = 50; | |
| 4392 | |
| 4393 /* LIMIT is to protect against circular lists. */ | |
| 4394 while (CONSP (elt) && --limit > 0 | |
| 4395 && (pos < max_pos || max_pos == -1)) | |
| 4396 { | |
| 4397 pos = generate_fstring_runes (w, data, pos, pos, max_pos, | |
| 4398 XCAR (elt), depth, max_pixsize, | |
| 438 | 4399 findex, type, offset, cur_ext); |
| 4187 | 4400 elt = XCDR (elt); |
| 4401 } | |
| 4402 } | |
| 428 | 4403 else if (EXTENTP (car)) |
| 4187 | 4404 { |
| 4405 struct extent *ext = XEXTENT (car); | |
| 4406 | |
| 4407 if (EXTENT_LIVE_P (ext)) | |
| 4408 { | |
| 4409 face_index old_findex = data->findex; | |
| 4410 Lisp_Object face; | |
| 4411 Lisp_Object font_inst; | |
| 4412 face_index new_findex; | |
| 4413 Bytecount start = data->bytepos; | |
| 4414 | |
| 4415 face = extent_face (ext); | |
| 4416 if (FACEP (face)) | |
| 4417 { | |
| 4418 /* #### needs to merge faces, sigh */ | |
| 4419 /* #### needs to handle list of faces */ | |
| 4420 new_findex = get_builtin_face_cache_index (w, face); | |
| 4421 /* !!#### not right; needs to compute the max height of | |
| 4422 all the charsets */ | |
| 4423 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex, | |
| 4424 Vcharset_ascii); | |
| 4425 | |
| 4426 data->dl->ascent = max (data->dl->ascent, | |
| 4427 XFONT_INSTANCE (font_inst)->ascent); | |
| 4428 data->dl->descent = max (data->dl->descent, | |
| 4429 XFONT_INSTANCE (font_inst)-> | |
| 4430 descent); | |
| 4431 } | |
| 4432 else | |
| 4433 new_findex = old_findex; | |
| 4434 | |
| 4435 data->findex = new_findex; | |
| 4436 pos = generate_fstring_runes (w, data, pos, pos, max_pos, | |
| 4437 XCDR (elt), depth - 1, | |
| 438 | 4438 max_pixsize, new_findex, type, |
| 4439 offset, car); | |
| 4187 | 4440 data->findex = old_findex; |
| 4441 Dynarr_add (formatted_string_extent_dynarr, ext); | |
| 4442 Dynarr_add (formatted_string_extent_start_dynarr, start); | |
| 4443 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos); | |
| 4444 } | |
| 4445 } | |
| 428 | 4446 } |
| 4447 else if (GLYPHP (elt)) | |
| 4448 { | |
| 438 | 4449 /* Glyphs are considered as one character with respect to the modeline |
| 4450 horizontal scrolling facility. -- dv */ | |
| 4451 if (*offset > 0) | |
| 4452 *offset -= 1; | |
| 4453 else | |
| 4454 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos, | |
| 4455 cur_ext); | |
| 428 | 4456 } |
| 4457 else | |
| 4458 { | |
| 4459 invalid: | |
| 438 | 4460 { |
| 4970 | 4461 const Ascbyte *str = GETTEXT ("*invalid*"); |
| 438 | 4462 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */ |
| 4463 | |
| 4464 if (size <= *offset) | |
| 4465 *offset -= size; | |
| 4466 else | |
| 4467 { | |
| 867 | 4468 const Ibyte *tmp_str = |
| 4469 itext_n_addr ((const Ibyte *) str, *offset); | |
| 438 | 4470 |
| 440 | 4471 /* #### NOTE: I don't understand why a tmp_max is not computed and |
| 438 | 4472 used here as in the plain string case above. -- dv */ |
| 4473 pos = add_string_to_fstring_db_runes (data, tmp_str, pos, | |
| 4474 min_pos, max_pos); | |
| 4475 *offset = 0; | |
| 4476 } | |
| 4477 } | |
| 428 | 4478 } |
| 4479 | |
| 4480 if (min_pos > pos) | |
| 4481 { | |
| 867 | 4482 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos, |
| 438 | 4483 min_pos, -1); |
| 428 | 4484 } |
| 4485 | |
| 4486 return pos; | |
| 4487 } | |
| 4488 | |
| 4489 /* Update just the modeline. Assumes the desired display structs. If | |
| 4490 they do not have a modeline block, it does nothing. */ | |
| 4491 static void | |
| 4492 regenerate_modeline (struct window *w) | |
| 4493 { | |
| 4494 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP); | |
| 4495 | |
| 4967 | 4496 if (!Dynarr_length (dla) || !Dynarr_begin (dla)->modeline) |
| 428 | 4497 return; |
| 4498 else | |
| 4499 { | |
| 4967 | 4500 generate_modeline (w, Dynarr_begin (dla), DESIRED_DISP); |
| 428 | 4501 redisplay_update_line (w, 0, 0, 0); |
| 4502 } | |
| 4503 } | |
| 4504 | |
| 4505 /* Make sure that modeline display line is present in the given | |
| 4506 display structs if the window has a modeline and update that | |
| 4507 line. Returns true if a modeline was needed. */ | |
| 4508 static int | |
| 4509 ensure_modeline_generated (struct window *w, int type) | |
| 4510 { | |
| 4511 int need_modeline; | |
| 4512 | |
| 4513 /* minibuffer windows don't have modelines */ | |
| 4514 if (MINI_WINDOW_P (w)) | |
| 4515 need_modeline = 0; | |
| 4516 /* windows which haven't had it turned off do */ | |
| 4517 else if (WINDOW_HAS_MODELINE_P (w)) | |
| 4518 need_modeline = 1; | |
| 4519 /* windows which have it turned off don't have a divider if there is | |
| 4520 a horizontal scrollbar */ | |
| 4521 else if (window_scrollbar_height (w)) | |
| 4522 need_modeline = 0; | |
| 4523 /* and in this case there is none */ | |
| 4524 else | |
| 4525 need_modeline = 1; | |
| 4526 | |
| 4527 if (need_modeline) | |
| 4528 { | |
| 4529 display_line_dynarr *dla; | |
| 4530 | |
| 4531 dla = window_display_lines (w, type); | |
| 4532 | |
| 4533 /* We don't care if there is a display line which is not | |
| 4187 | 4534 currently a modeline because it is definitely going to become |
| 4535 one if we have gotten to this point. */ | |
| 428 | 4536 if (Dynarr_length (dla) == 0) |
| 4537 { | |
| 4538 if (Dynarr_largest (dla) > 0) | |
| 5038 | 4539 Dynarr_incrementr (dla); |
| 428 | 4540 else |
| 4541 { | |
| 4542 struct display_line modeline; | |
| 4207 | 4543 |
| 4544 DISPLAY_LINE_INIT (modeline); | |
| 428 | 4545 Dynarr_add (dla, modeline); |
| 4546 } | |
| 4547 } | |
| 4548 | |
| 4549 /* If we're adding a new place marker go ahead and generate the | |
| 4187 | 4550 modeline so that it is available for use by |
| 4551 window_modeline_height. */ | |
| 4967 | 4552 generate_modeline (w, Dynarr_begin (dla), type); |
| 428 | 4553 } |
| 4554 | |
| 4555 return need_modeline; | |
| 4556 } | |
| 4557 | |
| 4558 /* #### Kludge or not a kludge. I tend towards the former. */ | |
| 4559 int | |
| 4560 real_current_modeline_height (struct window *w) | |
| 4561 { | |
| 4562 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer); | |
| 4563 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer); | |
| 4564 | |
| 4565 if (ensure_modeline_generated (w, CMOTION_DISP)) | |
| 4566 { | |
| 4567 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP); | |
| 4568 | |
| 4569 if (Dynarr_length (dla)) | |
| 4570 { | |
| 4967 | 4571 if (Dynarr_begin (dla)->modeline) |
| 4572 return (Dynarr_begin (dla)->ascent + | |
| 4573 Dynarr_begin (dla)->descent); | |
| 428 | 4574 } |
| 4575 } | |
| 4576 return 0; | |
| 4577 } | |
| 4578 | |
| 4579 | |
| 4580 /***************************************************************************/ | |
| 819 | 4581 /* */ |
| 826 | 4582 /* displayable string routines */ |
| 819 | 4583 /* */ |
| 428 | 4584 /***************************************************************************/ |
| 4585 | |
| 4586 /* Given a position for a string in a window, ensure that the given | |
| 4587 display line DL accurately represents the text on a line starting | |
| 4588 at the given position. | |
| 4589 | |
| 4590 Yes, this is duplicating the code of create_text_block, but it | |
| 4591 looked just too hard to change create_text_block to handle strings | |
| 4592 *and* buffers. We already make a distinction between the two | |
| 4593 elsewhere in the code so I think unifying them would require a | |
| 4594 complete MULE rewrite. Besides, the other distinction is that these | |
| 4595 functions cover text that the user *cannot edit* so we can remove | |
| 4596 everything to do with cursors, minibuffers etc. Eventually the | |
| 4597 modeline routines should be modified to use this code as it copes | |
| 4598 with many more types of display situation. */ | |
| 4599 | |
| 665 | 4600 static Charbpos |
| 428 | 4601 create_string_text_block (struct window *w, Lisp_Object disp_string, |
| 4602 struct display_line *dl, | |
| 826 | 4603 Charcount start_pos, |
| 428 | 4604 prop_block_dynarr **prop, |
| 4605 face_index default_face) | |
| 4606 { | |
| 4607 struct frame *f = XFRAME (w->frame); | |
| 4608 /* Note that a lot of the buffer controlled stuff has been left in | |
| 4609 because you might well want to make use of it (selective display | |
| 4610 etc), its just the buffer text that we do not use. However, it | |
| 4611 seems to be possible for buffer to be nil sometimes so protect | |
| 4612 against this case. */ | |
| 4613 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0; | |
| 4614 struct device *d = XDEVICE (f->device); | |
| 4615 | |
| 4616 /* we're working with these a lot so precalculate them */ | |
| 4617 Bytecount slen = XSTRING_LENGTH (disp_string); | |
| 826 | 4618 Bytecount byte_string_zv = slen; |
| 4619 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos); | |
| 428 | 4620 |
| 4621 pos_data data; | |
| 4622 | |
| 4623 int truncate_win = b ? window_truncation_on (w) : 0; | |
| 4624 | |
| 442 | 4625 /* We're going to ditch selective display for static text, it's an |
| 4626 FSF thing and invisible extents are the way to go here. | |
| 4627 Implementing it also relies on a number of buffer-specific | |
| 428 | 4628 functions that we don't have the luxury of being able to use |
| 4629 here. */ | |
| 4630 | |
| 4631 /* The variable ctl-arrow allows the user to specify what characters | |
| 4632 can actually be displayed and which octal should be used for. | |
| 4633 #### This variable should probably have some rethought done to | |
| 4634 it. | |
| 4635 | |
| 4636 #### It would also be really nice if you could specify that | |
| 4637 the characters come out in hex instead of in octal. Mule | |
| 4638 does that by adding a ctl-hexa variable similar to ctl-arrow, | |
| 4639 but that's bogus -- we need a more general solution. I | |
| 4640 think you need to extend the concept of display tables | |
| 4641 into a more general conversion mechanism. Ideally you | |
| 4642 could specify a Lisp function that converts characters, | |
| 4643 but this violates the Second Golden Rule and besides would | |
| 4644 make things way way way way slow. | |
| 4645 | |
| 4646 So instead, we extend the display-table concept, which was | |
| 4647 historically limited to 256-byte vectors, to one of the | |
| 4648 following: | |
| 4649 | |
| 4650 a) A 256-entry vector, for backward compatibility; | |
| 4651 b) char-table, mapping characters to values; | |
| 4652 c) range-table, mapping ranges of characters to values; | |
| 4653 d) a list of the above. | |
| 4654 | |
| 4655 The (d) option allows you to specify multiple display tables | |
| 4656 instead of just one. Each display table can specify conversions | |
| 4657 for some characters and leave others unchanged. The way the | |
| 4658 character gets displayed is determined by the first display table | |
| 4659 with a binding for that character. This way, you could call a | |
| 4660 function `enable-hex-display' that adds a hex display-table to | |
| 4661 the list of display tables for the current buffer. | |
| 4662 | |
| 4663 #### ...not yet implemented... Also, we extend the concept of | |
| 4664 "mapping" to include a printf-like spec. Thus you can make all | |
| 4665 extended characters show up as hex with a display table like | |
| 4666 this: | |
| 4667 | |
| 4187 | 4668 #s(range-table data ((256 524288) (format "%x"))) |
| 428 | 4669 |
| 4670 Since more than one display table is possible, you have | |
| 4671 great flexibility in mapping ranges of characters. */ | |
| 867 | 4672 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow) |
| 428 | 4673 ? XCHAR_OR_CHAR_INT (b->ctl_arrow) |
| 4674 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil)) | |
| 4675 ? 255 : 160)) : 255; | |
| 4676 | |
| 4677 Lisp_Object face_dt, window_dt; | |
| 4678 | |
| 4679 /* The text display block for this display line. */ | |
| 4680 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 4681 | |
| 4682 /* The first time through the main loop we need to force the glyph | |
| 4683 data to be updated. */ | |
| 4684 int initial = 1; | |
| 4685 | |
| 4686 /* Apparently the new extent_fragment_update returns an end position | |
| 4687 equal to the position passed in if there are no more runs to be | |
| 4688 displayed. */ | |
| 4689 int no_more_frags = 0; | |
| 4690 | |
| 4691 dl->used_prop_data = 0; | |
| 4692 dl->num_chars = 0; | |
| 442 | 4693 dl->line_continuation = 0; |
| 428 | 4694 |
| 4187 | 4695 /* Set up faces to use for clearing areas, used by output_display_line. */ |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
4696 dl->clear_findex = default_face; |
| 4187 | 4697 if (default_face > DEFAULT_INDEX) |
| 428 | 4698 { |
| 4699 dl->left_margin_findex = default_face; | |
| 4700 dl->right_margin_findex = default_face; | |
| 4701 } | |
| 4702 else | |
| 4703 { | |
| 434 | 4704 dl->left_margin_findex = |
| 428 | 4705 get_builtin_face_cache_index (w, Vleft_margin_face); |
| 434 | 4706 dl->right_margin_findex = |
| 428 | 4707 get_builtin_face_cache_index (w, Vright_margin_face); |
| 4708 } | |
| 4709 | |
| 4710 xzero (data); | |
| 4711 data.ef = extent_fragment_new (disp_string, f); | |
| 4712 | |
| 4713 /* These values are used by all of the rune addition routines. We add | |
| 4714 them to this structure for ease of passing. */ | |
| 4715 data.d = d; | |
| 793 | 4716 data.window = wrap_window (w); |
| 428 | 4717 data.db = db; |
| 4718 data.dl = dl; | |
| 4719 | |
| 826 | 4720 data.byte_charpos = byte_start_pos; |
| 428 | 4721 data.pixpos = dl->bounds.left_in; |
| 4722 data.last_charset = Qunbound; | |
| 4723 data.last_findex = default_face; | |
| 4724 data.result_str = Qnil; | |
| 4725 data.string = disp_string; | |
| 4726 | |
| 4727 /* Set the right boundary adjusting it to take into account any end | |
| 4728 glyph. Save the width of the end glyph for later use. */ | |
| 4729 data.max_pixpos = dl->bounds.right_in; | |
| 819 | 4730 data.max_pixpos -= data.end_glyph_width; |
| 428 | 4731 |
| 4732 data.cursor_type = NO_CURSOR; | |
| 4733 data.cursor_x = -1; | |
| 4734 | |
| 4735 data.start_col = 0; | |
| 4736 /* I don't think we want this, string areas should not scroll with | |
| 434 | 4737 the window |
| 428 | 4738 data.start_col = w->hscroll; |
| 826 | 4739 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0); |
| 428 | 4740 */ |
| 826 | 4741 data.byte_start_col_enabled = 0; |
| 428 | 4742 data.hscroll_glyph_width_adjust = 0; |
| 4743 | |
| 4744 /* We regenerate the line from the very beginning. */ | |
| 4745 Dynarr_reset (db->runes); | |
| 4746 | |
| 4747 /* Why is this less than or equal and not just less than? If the | |
| 4748 starting position is already equal to the maximum we can't add | |
| 4749 anything else, right? Wrong. We might still have a newline to | |
| 4750 add. A newline can use the room allocated for an end glyph since | |
| 4751 if we add it we know we aren't going to be adding any end | |
| 4752 glyph. */ | |
| 4753 | |
| 4754 /* #### Chuck -- I think this condition should be while (1). | |
| 4755 Otherwise if (e.g.) there is one begin-glyph and one end-glyph | |
| 4756 and the begin-glyph ends exactly at the end of the window, the | |
| 4757 end-glyph and text might not be displayed. while (1) ensures | |
| 4758 that the loop terminates only when either (a) there is | |
| 4759 propagation data or (b) the end-of-line or end-of-buffer is hit. | |
| 4760 | |
| 4761 #### Also I think you need to ensure that the operation | |
| 4762 "add begin glyphs; add end glyphs; add text" is atomic and | |
| 4763 can't get interrupted in the middle. If you run off the end | |
| 4764 of the line during that operation, then you keep accumulating | |
| 4765 propagation data until you're done. Otherwise, if the (e.g.) | |
| 4766 there's a begin glyph at a particular position and attempting | |
| 4767 to display that glyph results in window-end being hit and | |
| 4768 propagation data being generated, then the character at that | |
| 4769 position won't be displayed. | |
| 4770 | |
| 4771 #### See also the comment after the end of this loop, below. | |
| 4772 */ | |
| 4773 while (data.pixpos <= data.max_pixpos) | |
| 4774 { | |
| 4775 /* #### This check probably should not be necessary. */ | |
| 826 | 4776 if (data.byte_charpos > byte_string_zv) |
| 428 | 4777 { |
| 4778 /* #### urk! More of this lossage! */ | |
| 826 | 4779 data.byte_charpos--; |
| 428 | 4780 goto done; |
| 4781 } | |
| 4782 | |
| 4783 /* Check for face changes. */ | |
| 826 | 4784 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end)) |
| 428 | 4785 { |
| 819 | 4786 Lisp_Object last_glyph = Qnil; |
| 4787 /* Deal with clipped glyphs that we have already displayed. */ | |
| 4967 | 4788 if (*prop && Dynarr_begin (*prop)->type == PROP_GLYPH) |
| 4789 { | |
| 4790 last_glyph = Dynarr_begin (*prop)->data.p_glyph.glyph; | |
| 819 | 4791 Dynarr_free (*prop); |
| 4792 *prop = 0; | |
| 4793 } | |
| 428 | 4794 /* Now compute the face and begin/end-glyph information. */ |
| 4795 data.findex = | |
| 793 | 4796 /* Remember that the extent-fragment routines deal in |
| 4187 | 4797 Bytexpos's. */ |
| 826 | 4798 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph); |
| 428 | 4799 /* This is somewhat cheesy but the alternative is to |
| 4187 | 4800 propagate default_face into extent_fragment_update. */ |
| 428 | 4801 if (data.findex == DEFAULT_INDEX) |
| 4802 data.findex = default_face; | |
| 4803 | |
| 4804 get_display_tables (w, data.findex, &face_dt, &window_dt); | |
| 4805 | |
| 826 | 4806 if (data.byte_charpos == data.ef->end) |
| 428 | 4807 no_more_frags = 1; |
| 4808 } | |
| 4809 initial = 0; | |
| 4810 | |
| 4811 /* Determine what is next to be displayed. We first handle any | |
| 4187 | 4812 glyphs returned by glyphs_at_charbpos. If there are no glyphs to |
| 4813 display then we determine what to do based on the character at the | |
| 4814 current buffer position. */ | |
| 428 | 4815 |
| 4816 /* If the current position is covered by an invisible extent, do | |
| 4187 | 4817 nothing (except maybe add some ellipses). |
| 428 | 4818 |
| 4819 #### The behavior of begin and end-glyphs at the edge of an | |
| 4820 invisible extent should be investigated further. This is | |
| 4821 fairly low priority though. */ | |
| 4822 if (data.ef->invisible) | |
| 4823 { | |
| 4824 /* #### Chuck, perhaps you could look at this code? I don't | |
| 4825 really know what I'm doing. */ | |
| 4826 if (*prop) | |
| 4827 { | |
| 4828 Dynarr_free (*prop); | |
| 4829 *prop = 0; | |
| 4830 } | |
| 4831 | |
| 4832 /* The extent fragment code only sets this when we should | |
| 4833 really display the ellipses. It makes sure the ellipses | |
| 4834 don't get displayed more than once in a row. */ | |
| 4835 if (data.ef->invisible_ellipses) | |
| 4836 { | |
| 4837 struct glyph_block gb; | |
| 4838 | |
| 4839 data.ef->invisible_ellipses_already_displayed = 1; | |
| 4840 data.ef->invisible_ellipses = 0; | |
| 4841 gb.extent = Qnil; | |
| 4842 gb.glyph = Vinvisible_text_glyph; | |
| 4843 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, | |
| 4844 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX)); | |
| 4845 /* Perhaps they shouldn't propagate if the very next thing | |
| 4846 is to display a newline (for compatibility with | |
| 4847 selective-display-ellipses)? Maybe that's too | |
| 4848 abstruse. */ | |
| 4849 if (*prop) | |
| 4850 goto done; | |
| 4851 } | |
| 4852 | |
| 638 | 4853 /* #### What if we're dealing with a display table? */ |
| 428 | 4854 if (data.start_col) |
| 4855 data.start_col--; | |
| 4856 | |
| 826 | 4857 if (data.byte_charpos == byte_string_zv) |
| 428 | 4858 goto done; |
| 4859 else | |
| 826 | 4860 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 4861 } |
| 4862 | |
| 4863 /* If there is propagation data, then it represents the current | |
| 4187 | 4864 buffer position being displayed. Add them and advance the |
| 4865 position counter. This might also add the minibuffer | |
| 4866 prompt. */ | |
| 428 | 4867 else if (*prop) |
| 4868 { | |
| 4869 dl->used_prop_data = 1; | |
| 4870 *prop = add_propagation_runes (prop, &data); | |
| 4871 | |
| 4872 if (*prop) | |
| 4873 goto done; /* gee, a really narrow window */ | |
| 826 | 4874 else if (data.byte_charpos == byte_string_zv) |
| 428 | 4875 goto done; |
| 826 | 4876 else if (data.byte_charpos < 0) |
| 428 | 4877 /* #### urk urk urk! Aborts are not very fun! Fix this please! */ |
| 826 | 4878 data.byte_charpos = 0; |
| 428 | 4879 else |
| 826 | 4880 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 4881 } |
| 4882 | |
| 4883 /* If there are end glyphs, add them to the line. These are | |
| 4884 the end glyphs for the previous run of text. We add them | |
| 4885 here rather than doing them at the end of handling the | |
| 4886 previous run so that glyphs at the beginning and end of | |
| 4887 a line are handled correctly. */ | |
| 4888 else if (Dynarr_length (data.ef->end_glyphs) > 0) | |
| 4889 { | |
| 867 | 4890 data.ch = string_ichar (disp_string, data.byte_charpos); |
| 428 | 4891 *prop = add_glyph_runes (&data, END_GLYPHS); |
| 819 | 4892 |
| 4893 if (*prop) { | |
| 428 | 4894 goto done; |
| 819 | 4895 } |
| 428 | 4896 } |
| 4897 | |
| 4898 /* If there are begin glyphs, add them to the line. */ | |
| 4899 else if (Dynarr_length (data.ef->begin_glyphs) > 0) | |
| 4900 { | |
| 867 | 4901 data.ch = string_ichar (disp_string, data.byte_charpos); |
| 428 | 4902 *prop = add_glyph_runes (&data, BEGIN_GLYPHS); |
| 819 | 4903 |
| 4904 if (*prop) { | |
| 428 | 4905 goto done; |
| 819 | 4906 } |
| 428 | 4907 } |
| 4908 | |
| 4909 /* If at end-of-buffer, we've already processed begin and | |
| 4910 end-glyphs at this point and there's no text to process, | |
| 4911 so we're done. */ | |
| 826 | 4912 else if (data.byte_charpos == byte_string_zv) |
| 428 | 4913 goto done; |
| 4914 | |
| 4915 else | |
| 4916 { | |
| 4917 Lisp_Object entry = Qnil; | |
| 4918 /* Get the character at the current buffer position. */ | |
| 867 | 4919 data.ch = string_ichar (disp_string, data.byte_charpos); |
| 428 | 4920 if (!NILP (face_dt) || !NILP (window_dt)) |
| 4921 entry = display_table_entry (data.ch, face_dt, window_dt); | |
| 4922 | |
| 4923 /* If there is a display table entry for it, hand it off to | |
| 4187 | 4924 add_disp_table_entry_runes and let it worry about it. */ |
| 428 | 4925 if (!NILP (entry) && !EQ (entry, make_char (data.ch))) |
| 4926 { | |
| 4927 *prop = add_disp_table_entry_runes (&data, entry); | |
| 4928 | |
| 4929 if (*prop) | |
| 4930 goto done; | |
| 4931 } | |
| 4932 | |
| 4933 /* Check if we have hit a newline character. If so, add a marker | |
| 4187 | 4934 to the line and end this loop. */ |
| 428 | 4935 else if (data.ch == '\n') |
| 4936 { | |
|
5619
75ad4969a16d
Replace the 'flush face property with the opposite 'shrink one.
Didier Verna <didier@xemacs.org>
parents:
5617
diff
changeset
|
4937 /* Update the clearing face index unless the shrink property is |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
4938 set. -- dvl */ |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
4939 if ((data.findex > DEFAULT_INDEX) |
|
5619
75ad4969a16d
Replace the 'flush face property with the opposite 'shrink one.
Didier Verna <didier@xemacs.org>
parents:
5617
diff
changeset
|
4940 && ! WINDOW_FACE_CACHEL_SHRINK_P (w, data.findex)) |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
4941 dl->clear_findex = data.findex; |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
4942 |
| 428 | 4943 /* We aren't going to be adding an end glyph so give its |
| 4187 | 4944 space back in order to make sure that the cursor can |
| 4945 fit. */ | |
| 819 | 4946 data.max_pixpos += data.end_glyph_width; |
| 428 | 4947 goto done; |
| 4948 } | |
| 4949 | |
| 4950 /* If the current character is considered to be printable, then | |
| 4187 | 4951 just add it. */ |
| 428 | 4952 else if (data.ch >= printable_min) |
| 4953 { | |
| 867 | 4954 *prop = add_ichar_rune (&data); |
| 428 | 4955 if (*prop) |
| 4956 goto done; | |
| 4957 } | |
| 4958 | |
| 4959 /* If the current character is a tab, determine the next tab | |
| 4187 | 4960 starting position and add a blank rune which extends from the |
| 4961 current pixel position to that starting position. */ | |
| 428 | 4962 else if (data.ch == '\t') |
| 4963 { | |
| 4964 int tab_start_pixpos = data.pixpos; | |
| 4965 int next_tab_start; | |
| 4966 int char_tab_width; | |
| 4967 int prop_width = 0; | |
| 4968 | |
| 4969 if (data.start_col > 1) | |
| 4970 tab_start_pixpos -= (space_width (w) * (data.start_col - 1)); | |
| 4971 | |
| 4972 next_tab_start = | |
| 4973 next_tab_position (w, tab_start_pixpos, | |
| 4974 dl->bounds.left_in + | |
| 4975 data.hscroll_glyph_width_adjust); | |
| 4976 if (next_tab_start > data.max_pixpos) | |
| 4977 { | |
| 4978 prop_width = next_tab_start - data.max_pixpos; | |
| 4979 next_tab_start = data.max_pixpos; | |
| 4980 } | |
| 4981 data.blank_width = next_tab_start - data.pixpos; | |
| 4982 char_tab_width = | |
| 4983 (next_tab_start - tab_start_pixpos) / space_width (w); | |
| 4984 | |
| 4985 *prop = add_blank_rune (&data, w, char_tab_width); | |
| 4986 | |
| 4987 /* add_blank_rune is only supposed to be called with | |
| 819 | 4988 sizes guaranteed to fit in the available space. */ |
| 428 | 4989 assert (!(*prop)); |
| 4990 | |
| 4991 if (prop_width) | |
| 4992 { | |
| 4993 struct prop_block pb; | |
| 4994 *prop = Dynarr_new (prop_block); | |
| 4995 | |
| 4996 pb.type = PROP_BLANK; | |
| 4997 pb.data.p_blank.width = prop_width; | |
| 4998 pb.data.p_blank.findex = data.findex; | |
| 4999 Dynarr_add (*prop, pb); | |
| 5000 | |
| 5001 goto done; | |
| 5002 } | |
| 5003 } | |
| 5004 | |
| 5005 /* If character is a control character, pass it off to | |
| 4187 | 5006 add_control_char_runes. |
| 428 | 5007 |
| 5008 The is_*() routines have undefined results on | |
| 5009 arguments outside of the range [-1, 255]. (This | |
| 5010 often bites people who carelessly use `char' instead | |
| 5011 of `unsigned char'.) | |
| 5012 */ | |
| 867 | 5013 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch)) |
| 428 | 5014 { |
| 5015 *prop = add_control_char_runes (&data, b); | |
| 5016 | |
| 5017 if (*prop) | |
| 5018 goto done; | |
| 5019 } | |
| 5020 | |
| 5021 /* If the character is above the ASCII range and we have not | |
| 4187 | 5022 already handled it, then print it as an octal number. */ |
| 428 | 5023 else if (data.ch >= 0200) |
| 5024 { | |
| 5025 *prop = add_octal_runes (&data); | |
| 5026 | |
| 5027 if (*prop) | |
| 5028 goto done; | |
| 5029 } | |
| 5030 | |
| 5031 /* Assume the current character is considered to be printable, | |
| 4187 | 5032 then just add it. */ |
| 428 | 5033 else |
| 5034 { | |
| 867 | 5035 *prop = add_ichar_rune (&data); |
| 428 | 5036 if (*prop) |
| 5037 goto done; | |
| 5038 } | |
| 5039 | |
| 826 | 5040 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 5041 } |
| 5042 } | |
| 5043 | |
| 819 | 5044 done: |
| 428 | 5045 |
| 5046 /* Determine the starting point of the next line if we did not hit the | |
| 5047 end of the buffer. */ | |
| 826 | 5048 if (data.byte_charpos < byte_string_zv) |
| 428 | 5049 { |
| 5050 /* #### This check is not correct. If the line terminated | |
| 5051 due to a begin-glyph or end-glyph hitting window-end, then | |
| 826 | 5052 data.ch will not point to the character at data.byte_charpos. If |
| 428 | 5053 you make the two changes mentioned at the top of this loop, |
| 5054 you should be able to say '(if (*prop))'. That should also | |
| 826 | 5055 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b) |
| 428 | 5056 check. */ |
| 5057 | |
| 5058 /* The common case is that the line ended because we hit a newline. | |
| 4187 | 5059 In that case, the next character is just the next buffer |
| 5060 position. */ | |
| 428 | 5061 if (data.ch == '\n') |
| 5062 { | |
| 826 | 5063 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos); |
| 428 | 5064 } |
| 5065 | |
| 5066 /* Otherwise we have a buffer line which cannot fit on one display | |
| 4187 | 5067 line. */ |
| 428 | 5068 else |
| 5069 { | |
| 5070 struct glyph_block gb; | |
| 5071 struct glyph_cachel *cachel; | |
| 5072 | |
| 5073 /* If the line is to be truncated then we actually have to look | |
| 4187 | 5074 for the next newline. We also add the end-of-line glyph which |
| 5075 we know will fit because we adjusted the right border before | |
| 5076 we starting laying out the line. */ | |
| 819 | 5077 data.max_pixpos += data.end_glyph_width; |
| 428 | 5078 data.findex = default_face; |
| 5079 gb.extent = Qnil; | |
| 5080 | |
| 5081 if (truncate_win) | |
| 5082 { | |
| 826 | 5083 Bytecount byte_pos; |
| 428 | 5084 |
| 5085 /* Now find the start of the next line. */ | |
| 867 | 5086 byte_pos = byte_find_next_ichar_in_string (disp_string, '\n', |
| 826 | 5087 data.byte_charpos, 1); |
| 428 | 5088 |
| 5089 data.cursor_type = NO_CURSOR; | |
| 826 | 5090 data.byte_charpos = byte_pos; |
| 428 | 5091 gb.glyph = Vtruncation_glyph; |
| 5092 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX); | |
| 5093 } | |
| 5094 else | |
| 5095 { | |
| 5096 /* The cursor can never be on the continuation glyph. */ | |
| 5097 data.cursor_type = NO_CURSOR; | |
| 5098 | |
| 826 | 5099 /* data.byte_charpos is already at the start of the next line. */ |
| 428 | 5100 |
| 442 | 5101 dl->line_continuation = 1; |
| 428 | 5102 gb.glyph = Vcontinuation_glyph; |
| 5103 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX); | |
| 5104 } | |
| 5105 | |
| 819 | 5106 if (data.end_glyph_width) |
| 428 | 5107 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel); |
| 5108 | |
| 826 | 5109 if (truncate_win && data.byte_charpos == byte_string_zv) |
| 428 | 5110 { |
| 867 | 5111 const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string), |
| 826 | 5112 byte_string_zv); |
| 867 | 5113 DEC_IBYTEPTR (endb); |
| 5114 if (itext_ichar (endb) != '\n') | |
| 428 | 5115 { |
| 5116 /* #### Damn this losing shit. */ | |
| 826 | 5117 data.byte_charpos++; |
| 428 | 5118 } |
| 5119 } | |
| 5120 } | |
| 5121 } | |
| 826 | 5122 else if (data.byte_charpos == byte_string_zv) |
| 428 | 5123 { |
| 5124 /* create_text_block () adds a bogus \n marker here which screws | |
| 5125 up subwindow display. Since we never have a cursor in the | |
| 5126 gutter we can safely ignore it. */ | |
| 5127 } | |
| 5128 /* Calculate left whitespace boundary. */ | |
| 5129 { | |
| 5130 int elt = 0; | |
| 5131 | |
| 5132 /* Whitespace past a newline is considered right whitespace. */ | |
| 5133 while (elt < Dynarr_length (db->runes)) | |
| 5134 { | |
| 5135 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 5136 | |
| 5137 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ') | |
| 5138 || rb->type == RUNE_BLANK) | |
| 5139 { | |
| 5140 dl->bounds.left_white += rb->width; | |
| 5141 elt++; | |
| 5142 } | |
| 5143 else | |
| 5144 elt = Dynarr_length (db->runes); | |
| 5145 } | |
| 5146 } | |
| 5147 | |
| 5148 /* Calculate right whitespace boundary. */ | |
| 5149 { | |
| 5150 int elt = Dynarr_length (db->runes) - 1; | |
| 5151 int done = 0; | |
| 5152 | |
| 5153 while (!done && elt >= 0) | |
| 5154 { | |
| 5155 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 5156 | |
| 5157 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100 | |
| 5158 && isspace (rb->object.chr.ch)) | |
| 5159 && !rb->type == RUNE_BLANK) | |
| 5160 { | |
| 5161 dl->bounds.right_white = rb->xpos + rb->width; | |
| 5162 done = 1; | |
| 5163 } | |
| 5164 | |
| 5165 elt--; | |
| 5166 | |
| 5167 } | |
| 5168 | |
| 5169 /* The line is blank so everything is considered to be right | |
| 5170 whitespace. */ | |
| 5171 if (!done) | |
| 5172 dl->bounds.right_white = dl->bounds.left_in; | |
| 5173 } | |
| 5174 | |
| 5175 /* Set the display blocks bounds. */ | |
| 5176 db->start_pos = dl->bounds.left_in; | |
| 5177 if (Dynarr_length (db->runes)) | |
| 5178 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
5179 struct rune *rb = Dynarr_lastp (db->runes); |
| 428 | 5180 |
| 5181 db->end_pos = rb->xpos + rb->width; | |
| 5182 } | |
| 5183 else | |
| 5184 db->end_pos = dl->bounds.right_white; | |
| 5185 | |
| 819 | 5186 calculate_baseline (&data); |
| 428 | 5187 |
| 5188 dl->ascent = data.new_ascent; | |
| 5189 dl->descent = data.new_descent; | |
| 5190 | |
| 5191 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5192 unsigned short ascent = (unsigned short) XFIXNUM (w->minimum_line_ascent); |
| 428 | 5193 |
| 5194 if (dl->ascent < ascent) | |
| 5195 dl->ascent = ascent; | |
| 5196 } | |
| 5197 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5198 unsigned short descent = (unsigned short) XFIXNUM (w->minimum_line_descent); |
| 428 | 5199 |
| 5200 if (dl->descent < descent) | |
| 5201 dl->descent = descent; | |
| 5202 } | |
| 5203 | |
| 819 | 5204 calculate_yoffset (dl, db); |
| 5205 | |
| 428 | 5206 dl->cursor_elt = data.cursor_x; |
| 5207 /* #### lossage lossage lossage! Fix this shit! */ | |
| 826 | 5208 if (data.byte_charpos > byte_string_zv) |
| 5209 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string, | |
| 5210 byte_string_zv); | |
| 428 | 5211 else |
| 826 | 5212 dl->end_charpos = |
| 5213 buffer_or_string_bytexpos_to_charxpos (disp_string, | |
| 5214 data.byte_charpos) - 1; | |
| 428 | 5215 if (truncate_win) |
| 434 | 5216 data.dl->num_chars = |
| 826 | 5217 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
|
5218 b ? XFIXNUM (b->tab_width) : 8); |
| 428 | 5219 else |
| 5220 /* This doesn't correctly take into account tabs and control | |
| 5221 characters but if the window isn't being truncated then this | |
| 5222 value isn't going to end up being used anyhow. */ | |
| 826 | 5223 data.dl->num_chars = dl->end_charpos - dl->charpos; |
| 428 | 5224 |
| 5225 /* #### handle horizontally scrolled line with text none of which | |
| 5226 was actually laid out. */ | |
| 5227 | |
| 5228 /* #### handle any remainder of overlay arrow */ | |
| 5229 | |
| 5230 if (*prop == ADD_FAILED) | |
| 5231 *prop = NULL; | |
| 5232 | |
| 5233 if (truncate_win && *prop) | |
| 5234 { | |
| 5235 Dynarr_free (*prop); | |
| 5236 *prop = NULL; | |
| 5237 } | |
| 5238 | |
| 5239 extent_fragment_delete (data.ef); | |
| 5240 | |
| 5241 /* #### If we started at EOB, then make sure we return a value past | |
| 5242 it so that regenerate_window will exit properly. This is bogus. | |
| 5243 The main loop should get fixed so that it isn't necessary to call | |
| 5244 this function if we are already at EOB. */ | |
| 5245 | |
| 826 | 5246 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv) |
| 793 | 5247 return string_index_byte_to_char (disp_string, |
| 826 | 5248 data.byte_charpos) + 1; /* Yuck! */ |
| 428 | 5249 else |
| 826 | 5250 return string_index_byte_to_char (disp_string, data.byte_charpos); |
| 428 | 5251 } |
| 5252 | |
| 5253 /* Given a display line and a starting position, ensure that the | |
| 5254 contents of the display line accurately represent the visual | |
| 5255 representation of the buffer contents starting from the given | |
| 5256 position when displayed in the given window. The display line ends | |
| 5257 when the contents of the line reach the right boundary of the given | |
| 434 | 5258 window. |
| 5259 | |
| 428 | 5260 This is very similar to generate_display_line but with the same |
| 5261 limitations as create_string_text_block. I have taken the liberty | |
| 665 | 5262 of fixing the bytebpos stuff though.*/ |
| 5263 | |
| 5264 static Charbpos | |
| 428 | 5265 generate_string_display_line (struct window *w, Lisp_Object disp_string, |
| 5266 struct display_line *dl, | |
| 826 | 5267 Charcount start_pos, |
| 428 | 5268 prop_block_dynarr **prop, |
| 5269 face_index default_face) | |
| 5270 { | |
| 826 | 5271 Charcount ret_charcount; |
| 428 | 5272 |
| 5273 /* you must set bounds before calling this. */ | |
| 434 | 5274 |
| 428 | 5275 /* Reset what this line is using. */ |
| 5276 if (dl->display_blocks) | |
| 5277 Dynarr_reset (dl->display_blocks); | |
| 5278 if (dl->left_glyphs) | |
| 5279 { | |
| 5280 Dynarr_free (dl->left_glyphs); | |
| 5281 dl->left_glyphs = 0; | |
| 5282 } | |
| 5283 if (dl->right_glyphs) | |
| 5284 { | |
| 5285 Dynarr_free (dl->right_glyphs); | |
| 5286 dl->right_glyphs = 0; | |
| 5287 } | |
| 5288 | |
| 5289 /* We aren't generating a modeline at the moment. */ | |
| 5290 dl->modeline = 0; | |
| 5291 | |
| 5292 /* Create a display block for the text region of the line. */ | |
| 826 | 5293 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos, |
| 5294 prop, default_face); | |
| 5295 dl->charpos = start_pos; | |
| 5296 if (dl->end_charpos < dl->charpos) | |
| 5297 dl->end_charpos = dl->charpos; | |
| 428 | 5298 |
| 5299 /* If there are left glyphs associated with any character in the | |
| 5300 text block, then create a display block to handle them. */ | |
| 5301 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs)) | |
| 5302 create_left_glyph_block (w, dl, 0); | |
| 5303 | |
| 5304 /* If there are right glyphs associated with any character in the | |
| 5305 text block, then create a display block to handle them. */ | |
| 5306 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs)) | |
| 5307 create_right_glyph_block (w, dl); | |
| 5308 | |
| 826 | 5309 return ret_charcount; |
| 428 | 5310 } |
| 5311 | |
| 2518 | 5312 /* |
| 5313 | |
| 5038 | 5314 Info on reentrancy crashes, with backtraces given: |
| 5315 | |
| 5316 (Info-goto-node "(internals)Critical Redisplay Sections") | |
| 5317 | |
| 1318 | 5318 */ |
| 5319 | |
| 5320 | |
| 428 | 5321 /* This is ripped off from regenerate_window. All we want to do is |
| 5322 loop through elements in the string creating display lines until we | |
| 5323 have covered the provided area. Simple really. */ | |
| 5324 void | |
| 5325 generate_displayable_area (struct window *w, Lisp_Object disp_string, | |
| 5326 int xpos, int ypos, int width, int height, | |
| 5327 display_line_dynarr* dla, | |
| 826 | 5328 Charcount start_pos, |
| 428 | 5329 face_index default_face) |
| 5330 { | |
| 5331 int yend = ypos + height; | |
| 5332 Charcount s_zv; | |
| 5333 prop_block_dynarr *prop = 0; | |
| 5334 layout_bounds bounds; | |
| 2518 | 5335 int depth = -1; |
| 5336 | |
| 428 | 5337 /* if there's nothing to do then do nothing. code after this assumes |
| 5338 there is something to do. */ | |
| 5339 if (NILP (disp_string)) | |
| 5340 return; | |
| 5341 | |
| 2518 | 5342 /* See comment in regenerate_window() */ |
| 5343 if (!in_display) | |
| 5344 depth = enter_redisplay_critical_section (); | |
| 5345 | |
| 5346 assert (dla); | |
| 5347 Dynarr_reset (dla); | |
| 5348 | |
| 826 | 5349 s_zv = string_char_length (disp_string); |
| 428 | 5350 |
| 5351 bounds.left_out = xpos; | |
| 5352 bounds.right_out = xpos + width; | |
| 5353 /* The inner boundaries mark where the glyph margins are located. */ | |
| 5354 bounds.left_in = bounds.left_out + window_left_margin_width (w); | |
| 5355 bounds.right_in = bounds.right_out - window_right_margin_width (w); | |
| 5356 /* We cannot fully calculate the whitespace boundaries as they | |
| 5357 depend on the contents of the line being displayed. */ | |
| 5358 bounds.left_white = bounds.left_in; | |
| 5359 bounds.right_white = bounds.right_in; | |
| 5360 | |
| 5361 while (ypos < yend) | |
| 5362 { | |
| 5363 struct display_line dl; | |
| 5364 struct display_line *dlp; | |
| 826 | 5365 Charcount next_pos; |
| 428 | 5366 int local; |
| 851 | 5367 int pos_of_dlp = -1; |
| 428 | 5368 |
| 5369 if (Dynarr_length (dla) < Dynarr_largest (dla)) | |
| 5370 { | |
| 851 | 5371 pos_of_dlp = Dynarr_length (dla); |
| 5372 dlp = Dynarr_atp (dla, pos_of_dlp); | |
| 428 | 5373 local = 0; |
| 5374 } | |
| 5375 else | |
| 5376 { | |
| 4207 | 5377 DISPLAY_LINE_INIT (dl); |
| 428 | 5378 dlp = &dl; |
| 5379 local = 1; | |
| 5380 } | |
| 5381 | |
| 5382 dlp->bounds = bounds; | |
| 5383 dlp->offset = 0; | |
| 1318 | 5384 Dynarr_lock (dla); |
| 428 | 5385 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos, |
| 5386 &prop, default_face); | |
| 1318 | 5387 Dynarr_unlock (dla); |
| 428 | 5388 /* we need to make sure that we continue along the line if there |
| 4187 | 5389 is more left to display otherwise we just end up redisplaying |
| 5390 the same chunk over and over again. */ | |
| 428 | 5391 if (next_pos == start_pos && next_pos < s_zv) |
| 5392 start_pos++; | |
| 5393 else | |
| 5394 start_pos = next_pos; | |
| 5395 | |
| 5396 dlp->ypos = ypos + dlp->ascent; | |
| 5397 ypos = dlp->ypos + dlp->descent; | |
| 5398 | |
| 5399 if (ypos > yend) | |
| 5400 { | |
| 5401 int visible_height = dlp->ascent + dlp->descent; | |
| 5402 | |
| 5403 dlp->clip = (ypos - yend); | |
| 5404 visible_height -= dlp->clip; | |
| 5405 | |
| 5406 if (visible_height < VERTICAL_CLIP (w, 1)) | |
| 5407 { | |
| 5408 if (local) | |
| 5409 free_display_line (dlp); | |
| 5410 break; | |
| 5411 } | |
| 5412 } | |
| 5413 else | |
| 5414 dlp->clip = 0; | |
| 5415 | |
|
4418
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5416 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
|
5417 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
|
5418 else if (pos_of_dlp == Dynarr_length (dla)) |
| 5038 | 5419 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
|
5420 else |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5421 ABORT (); |
| 428 | 5422 |
| 5423 /* #### This type of check needs to be done down in the | |
| 5424 generate_display_line call. */ | |
| 5425 if (start_pos >= s_zv) | |
| 5426 break; | |
| 5427 } | |
| 5428 | |
| 5429 if (prop) | |
| 5430 Dynarr_free (prop); | |
| 2518 | 5431 |
| 5432 if (depth >= 0) | |
| 5433 exit_redisplay_critical_section (depth); | |
| 428 | 5434 } |
| 5435 | |
| 5436 | |
| 5437 /***************************************************************************/ | |
| 5438 /* */ | |
| 5439 /* window-regeneration routines */ | |
| 5440 /* */ | |
| 5441 /***************************************************************************/ | |
| 5442 | |
| 5443 /* For a given window and starting position in the buffer it contains, | |
| 5444 ensure that the TYPE display lines accurately represent the | |
| 5445 presentation of the window. We pass the buffer instead of getting | |
| 5446 it from the window since redisplay_window may have temporarily | |
| 5447 changed it to the echo area buffer. */ | |
| 5448 | |
| 5449 static void | |
| 2518 | 5450 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, |
| 5451 int type) | |
| 428 | 5452 { |
| 5453 struct frame *f = XFRAME (w->frame); | |
| 5454 struct buffer *b = XBUFFER (w->buffer); | |
| 5455 int ypos = WINDOW_TEXT_TOP (w); | |
| 5456 int yend; /* set farther down */ | |
| 5457 int yclip = WINDOW_TEXT_TOP_CLIP (w); | |
| 442 | 5458 int force; |
| 2518 | 5459 int depth = -1; |
| 428 | 5460 |
| 5461 prop_block_dynarr *prop; | |
| 5462 layout_bounds bounds; | |
| 5463 display_line_dynarr *dla; | |
| 5464 int need_modeline; | |
| 5465 | |
| 5466 /* The lines had better exist by this point. */ | |
| 5467 if (!(dla = window_display_lines (w, type))) | |
| 2500 | 5468 ABORT (); |
| 2518 | 5469 |
| 5470 if (!in_display) | |
| 5471 depth = enter_redisplay_critical_section (); | |
| 5472 | |
| 5038 | 5473 /* This is one spot where a reentrancy crash will occur, due to a check |
| 2518 | 5474 in the dynarr to make sure it isn't "locked" */ |
| 5475 /* | |
| 5476 | |
| 5038 | 5477 Info on reentrancy crashes, with backtraces given: |
| 5478 | |
| 5479 (Info-goto-node "(internals)Critical Redisplay Sections") | |
| 2518 | 5480 */ |
| 5481 | |
| 428 | 5482 Dynarr_reset (dla); |
| 5483 w->max_line_len = 0; | |
| 5484 | |
| 4968 | 5485 /* Added 2-1-10 -- we should never have empty face or glyph cachels |
| 5486 because we initialized them at startup and the only way to reduce | |
| 5487 their number is through calling reset_face_cachels() or | |
| 5488 reset_glyph_cachels(), which as a side effect sets up a number of | |
| 5489 standard entries */ | |
| 5490 assert (Dynarr_length (w->face_cachels)); | |
| 5491 assert (Dynarr_length (w->glyph_cachels)); | |
| 5492 | |
| 5493 #if 0 | |
| 5494 /* #### Delete this code sometime later than 2-1-10 when we're sure it's | |
| 5495 not needed */ | |
| 428 | 5496 /* Normally these get updated in redisplay_window but it is possible |
| 5497 for this function to get called from some other points where that | |
| 5498 update may not have occurred. This acts as a safety check. */ | |
| 5499 if (!Dynarr_length (w->face_cachels)) | |
| 5500 reset_face_cachels (w); | |
| 5501 if (!Dynarr_length (w->glyph_cachels)) | |
| 5502 reset_glyph_cachels (w); | |
| 4968 | 5503 #endif |
| 428 | 5504 |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
5505 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
|
5506 Fset_marker (w->pointm[type], make_fixnum (point), w->buffer); |
| 428 | 5507 w->last_point_x[type] = -1; |
| 5508 w->last_point_y[type] = -1; | |
| 5509 | |
| 5510 /* Make sure a modeline is in the structs if needed. */ | |
| 5511 need_modeline = ensure_modeline_generated (w, type); | |
| 5512 | |
| 5513 /* Wait until here to set this so that the structs have a modeline | |
| 5514 generated in the case where one didn't exist. */ | |
| 5515 yend = WINDOW_TEXT_BOTTOM (w); | |
| 5516 | |
| 5517 bounds = calculate_display_line_boundaries (w, 0); | |
| 5518 | |
| 5519 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */ | |
| 5520 if (MINI_WINDOW_P (w) | |
| 5521 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt)) | |
| 5522 && !echo_area_active (f) | |
| 5523 && start_pos == BUF_BEGV (b)) | |
| 5524 { | |
| 5525 struct prop_block pb; | |
| 5526 Lisp_Object string; | |
| 5527 prop = Dynarr_new (prop_block); | |
| 5528 | |
| 5198 | 5529 string = concat2 (Vminibuf_preprompt, Vminibuf_prompt); |
| 428 | 5530 pb.type = PROP_MINIBUF_PROMPT; |
| 5198 | 5531 pb.data.p_string.str = XSTRING_DATA (string); |
| 5532 pb.data.p_string.len = XSTRING_LENGTH (string); | |
| 428 | 5533 Dynarr_add (prop, pb); |
| 5534 } | |
| 5535 else | |
| 5536 prop = 0; | |
| 5537 | |
| 442 | 5538 /* When we are computing things for scrolling purposes, make |
| 5539 sure at least one line is always generated */ | |
| 5540 force = (type == CMOTION_DISP); | |
| 5541 | |
| 5542 /* Make sure this is set always */ | |
| 5543 /* Note the conversion at end */ | |
| 5544 w->window_end_pos[type] = start_pos; | |
| 5545 while (ypos < yend || force) | |
| 428 | 5546 { |
| 5547 struct display_line dl; | |
| 5548 struct display_line *dlp; | |
| 5549 int local; | |
| 851 | 5550 int pos_of_dlp = -1; |
| 428 | 5551 |
| 5552 if (Dynarr_length (dla) < Dynarr_largest (dla)) | |
| 5553 { | |
| 851 | 5554 pos_of_dlp = Dynarr_length (dla); |
| 5555 dlp = Dynarr_atp (dla, pos_of_dlp); | |
| 428 | 5556 local = 0; |
| 5557 } | |
| 5558 else | |
| 5559 { | |
| 4207 | 5560 DISPLAY_LINE_INIT (dl); |
| 428 | 5561 dlp = &dl; |
| 5562 local = 1; | |
| 5563 } | |
| 5564 | |
| 5565 dlp->bounds = bounds; | |
| 5566 dlp->offset = 0; | |
| 1318 | 5567 Dynarr_lock (dla); |
| 428 | 5568 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type); |
| 1318 | 5569 Dynarr_unlock (dla); |
| 428 | 5570 |
| 5571 if (yclip > dlp->ascent) | |
| 5572 { | |
| 5573 /* this should never happen, but if it does just display the | |
| 5574 whole line */ | |
| 5575 yclip = 0; | |
| 5576 } | |
| 5577 | |
| 5578 dlp->ypos = (ypos + dlp->ascent) - yclip; | |
| 5579 ypos = dlp->ypos + dlp->descent; | |
| 5580 | |
| 5581 /* See if we've been asked to start midway through a line, for | |
| 4187 | 5582 partial display line scrolling. */ |
| 434 | 5583 if (yclip) |
| 428 | 5584 { |
| 5585 dlp->top_clip = yclip; | |
| 5586 yclip = 0; | |
| 5587 } | |
| 5588 else | |
| 5589 dlp->top_clip = 0; | |
| 5590 | |
| 5591 if (ypos > yend) | |
| 5592 { | |
| 5593 int visible_height = dlp->ascent + dlp->descent; | |
| 5594 | |
| 5595 dlp->clip = (ypos - yend); | |
| 5596 /* Although this seems strange we could have a single very | |
| 5597 tall line visible for which we need to account for both | |
| 5598 the top clip and the bottom clip. */ | |
| 5599 visible_height -= (dlp->clip + dlp->top_clip); | |
| 5600 | |
| 442 | 5601 if (visible_height < VERTICAL_CLIP (w, 1) && !force) |
| 428 | 5602 { |
| 5603 if (local) | |
| 5604 free_display_line (dlp); | |
| 5605 break; | |
| 5606 } | |
| 5607 } | |
| 5608 else | |
| 5609 dlp->clip = 0; | |
| 5610 | |
| 5611 if (dlp->cursor_elt != -1) | |
| 5612 { | |
| 5613 /* #### This check is steaming crap. Have to get things | |
| 4187 | 5614 fixed so when create_text_block hits EOB, we're done, |
| 5615 period. */ | |
| 428 | 5616 if (w->last_point_x[type] == -1) |
| 5617 { | |
| 5618 w->last_point_x[type] = dlp->cursor_elt; | |
| 5619 w->last_point_y[type] = Dynarr_length (dla); | |
| 5620 } | |
| 5621 else | |
| 5622 { | |
| 5623 /* #### This means that we've added a cursor at EOB | |
| 4187 | 5624 twice. Yuck oh yuck. */ |
| 1318 | 5625 struct display_block *db; |
| 5626 | |
| 5627 Dynarr_lock (dla); | |
| 5628 db = get_display_block_from_line (dlp, TEXT); | |
| 5629 Dynarr_unlock (dla); | |
| 428 | 5630 |
| 5631 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR; | |
| 5632 dlp->cursor_elt = -1; | |
| 5633 } | |
| 5634 } | |
| 5635 | |
| 5636 if (dlp->num_chars > w->max_line_len) | |
| 5637 w->max_line_len = dlp->num_chars; | |
| 5638 | |
|
4418
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5639 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
|
5640 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
|
5641 else if (pos_of_dlp == Dynarr_length (dla)) |
| 5038 | 5642 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
|
5643 else |
|
9bcdf9a3a783
Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents:
4207
diff
changeset
|
5644 ABORT (); |
| 428 | 5645 |
| 5646 /* #### This isn't right, but it is close enough for now. */ | |
| 5647 w->window_end_pos[type] = start_pos; | |
| 5648 | |
| 5649 /* #### This type of check needs to be done down in the | |
| 5650 generate_display_line call. */ | |
| 5651 if (start_pos > BUF_ZV (b)) | |
| 5652 break; | |
| 442 | 5653 |
| 5654 force = 0; | |
| 428 | 5655 } |
| 5656 | |
| 5657 if (prop) | |
| 5658 Dynarr_free (prop); | |
| 5659 | |
| 5660 /* #### More not quite right, but close enough. */ | |
| 442 | 5661 /* Ben sez: apparently window_end_pos[] is measured |
| 428 | 5662 as the number of characters between the window end and the |
| 5663 end of the buffer? This seems rather weirdo. What's | |
| 442 | 5664 the justification for this? |
| 5665 | |
| 5666 JV sez: Because BUF_Z (b) would be a good initial value, however | |
| 5667 that can change. This representation allows initalizing with 0. | |
| 5668 */ | |
| 428 | 5669 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type]; |
| 5670 | |
| 5671 if (need_modeline) | |
| 5672 { | |
| 5673 /* We know that this is the right thing to use because we put it | |
| 4187 | 5674 there when we first started working in this function. */ |
| 4967 | 5675 generate_modeline (w, Dynarr_begin (dla), type); |
| 428 | 5676 } |
| 2518 | 5677 |
| 5678 if (depth >= 0) | |
| 5679 exit_redisplay_critical_section (depth); | |
| 428 | 5680 } |
| 5681 | |
| 826 | 5682 #define REGEN_INC_FIND_START_END \ |
| 5683 do { \ | |
| 5684 /* Determine start and end of lines. */ \ | |
| 5685 if (!Dynarr_length (cdla)) \ | |
| 5686 return 0; \ | |
| 5687 else \ | |
| 5688 { \ | |
| 4967 | 5689 if (Dynarr_begin (cdla)->modeline && Dynarr_begin (ddla)->modeline) \ |
| 826 | 5690 { \ |
| 5691 dla_start = 1; \ | |
| 5692 } \ | |
| 4967 | 5693 else if (!Dynarr_begin (cdla)->modeline \ |
| 5694 && !Dynarr_begin (ddla)->modeline) \ | |
| 826 | 5695 { \ |
| 5696 dla_start = 0; \ | |
| 5697 } \ | |
| 5698 else \ | |
| 2500 | 5699 ABORT (); /* structs differ */ \ |
| 826 | 5700 \ |
| 5701 dla_end = Dynarr_length (cdla) - 1; \ | |
| 5702 } \ | |
| 5703 \ | |
| 5704 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \ | |
| 5705 + Dynarr_atp (cdla, dla_start)->offset); \ | |
| 5706 /* If this isn't true, then startp has changed and we need to do a \ | |
| 5707 full regen. */ \ | |
| 5708 if (startp != start_pos) \ | |
| 5709 return 0; \ | |
| 5710 \ | |
| 5711 /* Point is outside the visible region so give up. */ \ | |
| 5712 if (pointm < start_pos) \ | |
| 5713 return 0; \ | |
| 5714 \ | |
| 428 | 5715 } while (0) |
| 5716 | |
| 5717 /* This attempts to incrementally update the display structures. It | |
| 5718 returns a boolean indicating success or failure. This function is | |
| 5719 very similar to regenerate_window_incrementally and is in fact only | |
| 5720 called from that function. However, because of the nature of the | |
| 5721 changes it deals with it sometimes makes different assumptions | |
| 5722 which can lead to success which are much more difficult to make | |
| 5723 when dealing with buffer changes. */ | |
| 5724 | |
| 5725 static int | |
| 665 | 5726 regenerate_window_extents_only_changed (struct window *w, Charbpos startp, |
| 5727 Charbpos pointm, | |
| 428 | 5728 Charcount beg_unchanged, |
| 5729 Charcount end_unchanged) | |
| 5730 { | |
| 5731 struct buffer *b = XBUFFER (w->buffer); | |
| 5732 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP); | |
| 5733 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP); | |
| 5734 | |
| 5735 int dla_start = 0; | |
| 5736 int dla_end, line; | |
| 5737 int first_line, last_line; | |
| 665 | 5738 Charbpos start_pos; |
| 428 | 5739 /* Don't define this in the loop where it is used because we |
| 5740 definitely want its value to survive between passes. */ | |
| 5741 prop_block_dynarr *prop = NULL; | |
| 5742 | |
| 5743 /* If we don't have any buffer change recorded but the modiff flag has | |
| 5744 been incremented, then fail. I'm not sure of the exact circumstances | |
| 5745 under which this can happen, but I believe that it is probably a | |
| 5746 reasonable happening. */ | |
| 5747 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
|
5748 || XFIXNUM (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)) |
| 428 | 5749 return 0; |
| 5750 | |
| 5751 /* If the cursor is moved we attempt to update it. If we succeed we | |
| 5752 go ahead and proceed with the optimization attempt. */ | |
| 5753 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer) | |
| 5754 || pointm != marker_position (w->last_point[CURRENT_DISP])) | |
| 5755 { | |
| 5756 struct frame *f = XFRAME (w->frame); | |
| 5757 struct device *d = XDEVICE (f->device); | |
| 5758 struct frame *sel_f = device_selected_frame (d); | |
| 5759 int success = 0; | |
| 5760 | |
| 5761 if (w->last_point_x[CURRENT_DISP] != -1 | |
| 5762 && w->last_point_y[CURRENT_DISP] != -1) | |
| 5763 { | |
| 5764 | |
| 5765 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w))) | |
| 5766 { | |
| 5767 /* Always regenerate the modeline in case it is | |
| 4187 | 5768 displaying the current line or column. */ |
| 428 | 5769 regenerate_modeline (w); |
| 5770 success = 1; | |
| 5771 } | |
| 5772 } | |
| 5773 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f))) | |
| 5774 { | |
| 5775 if (f->modeline_changed) | |
| 5776 regenerate_modeline (w); | |
| 5777 success = 1; | |
| 5778 } | |
| 5779 | |
| 5780 if (!success) | |
| 5781 return 0; | |
| 5782 } | |
| 5783 | |
| 5784 if (beg_unchanged == -1 && end_unchanged == -1) | |
| 5785 return 1; | |
| 5786 | |
| 5787 /* assert: There are no buffer modifications or they are all below the | |
| 5788 visible region. We assume that regenerate_window_incrementally has | |
| 5789 not called us unless this is true. */ | |
| 5790 | |
| 5791 REGEN_INC_FIND_START_END; | |
| 5792 | |
| 5793 /* If the changed are starts before the visible area, give up. */ | |
| 5794 if (beg_unchanged < startp) | |
| 5795 return 0; | |
| 5796 | |
| 5797 /* Find what display line the extent changes first affect. */ | |
| 5798 line = dla_start; | |
| 5799 while (line <= dla_end) | |
| 5800 { | |
| 5801 struct display_line *dl = Dynarr_atp (cdla, line); | |
| 826 | 5802 Charbpos lstart = dl->charpos + dl->offset; |
| 5803 Charbpos lend = dl->end_charpos + dl->offset; | |
| 428 | 5804 |
| 5805 if (beg_unchanged >= lstart && beg_unchanged <= lend) | |
| 5806 break; | |
| 5807 | |
| 5808 line++; | |
| 5809 } | |
| 5810 | |
| 5811 /* If the changes are below the visible area then if point hasn't | |
| 5812 moved return success otherwise fail in order to be safe. */ | |
| 5813 if (line > dla_end) | |
| 5814 { | |
| 5815 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer) | |
| 5816 && pointm == marker_position (w->last_point[CURRENT_DISP])) | |
| 5817 return 1; | |
| 5818 else | |
| 5819 return 0; | |
| 5820 } | |
| 5821 | |
| 5822 /* At this point we know what line the changes first affect. We now | |
| 5823 begin redrawing lines as long as we are still in the affected | |
| 5824 region and the line's size and positioning don't change. | |
| 5825 Otherwise we fail. If we fail we will have altered the desired | |
| 5826 structs which could lead to an assertion failure. However, if we | |
| 5827 fail the next thing that is going to happen is a full regen so we | |
| 5828 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
|
5829 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
|
5830 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
|
5831 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
|
5832 Fset_marker (w->last_point[DESIRED_DISP], make_fixnum (pointm), w->buffer); |
| 428 | 5833 |
| 5834 first_line = last_line = line; | |
| 5835 while (line <= dla_end) | |
| 5836 { | |
| 2286 | 5837 Charbpos old_start, old_end; |
| 428 | 5838 struct display_line *cdl = Dynarr_atp (cdla, line); |
| 5839 struct display_line *ddl = Dynarr_atp (ddla, line); | |
| 5840 struct display_block *db; | |
| 5841 int initial_size; | |
| 5842 | |
| 826 | 5843 assert (cdl->charpos == ddl->charpos); |
| 5844 assert (cdl->end_charpos == ddl->end_charpos); | |
| 428 | 5845 assert (cdl->offset == ddl->offset); |
| 5846 | |
| 5847 db = get_display_block_from_line (ddl, TEXT); | |
| 5848 initial_size = Dynarr_length (db->runes); | |
| 826 | 5849 old_start = ddl->charpos + ddl->offset; |
| 5850 old_end = ddl->end_charpos + ddl->offset; | |
| 428 | 5851 |
| 5852 /* If this is the first line being updated and it used | |
| 4187 | 5853 propagation data, fail. Otherwise we'll be okay because |
| 5854 we'll have the necessary propagation data. */ | |
| 428 | 5855 if (line == first_line && ddl->used_prop_data) |
| 5856 return 0; | |
| 5857 | |
| 2286 | 5858 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, |
| 5859 &prop, DESIRED_DISP); | |
| 428 | 5860 ddl->offset = 0; |
| 5861 | |
| 5862 /* #### If there is propagated stuff the fail. We could | |
| 4187 | 5863 probably actually deal with this if the line had propagated |
| 5864 information when originally created by a full | |
| 5865 regeneration. */ | |
| 428 | 5866 if (prop) |
| 5867 { | |
| 5868 Dynarr_free (prop); | |
| 5869 return 0; | |
| 5870 } | |
| 5871 | |
| 5872 /* If any line position parameters have changed or a | |
| 4187 | 5873 cursor has disappeared or disappeared, fail. */ |
| 428 | 5874 db = get_display_block_from_line (ddl, TEXT); |
| 5875 if (cdl->ypos != ddl->ypos | |
| 5876 || cdl->ascent != ddl->ascent | |
| 5877 || cdl->descent != ddl->descent | |
| 5878 || cdl->top_clip != ddl->top_clip | |
| 5879 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1) | |
| 5880 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1) | |
| 826 | 5881 || old_start != ddl->charpos |
| 5882 || old_end != ddl->end_charpos | |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
5883 || initial_size != Dynarr_length (db->runes) |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
5884 || cdl->clear_findex != ddl->clear_findex) |
| 428 | 5885 { |
| 5886 return 0; | |
| 5887 } | |
| 5888 | |
| 5889 if (ddl->cursor_elt != -1) | |
| 5890 { | |
| 5891 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt; | |
| 5892 w->last_point_y[DESIRED_DISP] = line; | |
| 5893 } | |
| 5894 | |
| 5895 last_line = line; | |
| 5896 | |
| 5897 /* If the extent changes end on the line we just updated then | |
| 4187 | 5898 we're done. Otherwise go on to the next line. */ |
| 826 | 5899 if (end_unchanged <= ddl->end_charpos) |
| 428 | 5900 break; |
| 5901 else | |
| 5902 line++; | |
| 5903 } | |
| 5904 | |
| 5905 redisplay_update_line (w, first_line, last_line, 1); | |
| 5906 return 1; | |
| 5907 } | |
| 5908 | |
| 5909 /* Attempt to update the display data structures based on knowledge of | |
| 5910 the changed region in the buffer. Returns a boolean indicating | |
| 5911 success or failure. If this function returns a failure then a | |
| 5912 regenerate_window _must_ be performed next in order to maintain | |
| 5913 invariants located here. */ | |
| 5914 | |
| 5915 static int | |
| 665 | 5916 regenerate_window_incrementally (struct window *w, Charbpos startp, |
| 5917 Charbpos pointm) | |
| 428 | 5918 { |
| 5919 struct buffer *b = XBUFFER (w->buffer); | |
| 5920 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP); | |
| 5921 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP); | |
| 5922 Charcount beg_unchanged, end_unchanged; | |
| 5923 Charcount extent_beg_unchanged, extent_end_unchanged; | |
| 5924 | |
| 5925 int dla_start = 0; | |
| 5926 int dla_end, line; | |
| 665 | 5927 Charbpos start_pos; |
| 428 | 5928 |
| 5929 /* If this function is called, the current and desired structures | |
| 5930 had better be identical. If they are not, then that is a bug. */ | |
| 5931 assert (Dynarr_length (cdla) == Dynarr_length (ddla)); | |
| 5932 | |
| 5933 /* We don't handle minibuffer windows yet. The minibuffer prompt | |
| 5934 screws us up. */ | |
| 5935 if (MINI_WINDOW_P (w)) | |
| 5936 return 0; | |
| 5937 | |
| 5938 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b); | |
| 5939 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1 | |
| 5940 ? -1 | |
| 5941 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b)); | |
| 5942 | |
| 5943 /* If nothing has changed in the buffer, then make sure point is ok | |
| 5944 and succeed. */ | |
| 5945 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1) | |
| 5946 return regenerate_window_extents_only_changed (w, startp, pointm, | |
| 5947 extent_beg_unchanged, | |
| 5948 extent_end_unchanged); | |
| 5949 | |
| 5950 /* We can't deal with deleted newlines. */ | |
| 5951 if (BUF_NEWLINE_WAS_DELETED (b)) | |
| 5952 return 0; | |
| 5953 | |
| 5954 beg_unchanged = BUF_BEGIN_UNCHANGED (b); | |
| 5955 end_unchanged = (BUF_END_UNCHANGED (b) == -1 | |
| 5956 ? -1 | |
| 5957 : BUF_Z (b) - BUF_END_UNCHANGED (b)); | |
| 5958 | |
| 5959 REGEN_INC_FIND_START_END; | |
| 5960 | |
| 5961 /* If the changed area starts before the visible area, give up. */ | |
| 5962 if (beg_unchanged < startp) | |
| 5963 return 0; | |
| 5964 | |
| 5965 /* Find what display line the buffer changes first affect. */ | |
| 5966 line = dla_start; | |
| 5967 while (line <= dla_end) | |
| 5968 { | |
| 5969 struct display_line *dl = Dynarr_atp (cdla, line); | |
| 826 | 5970 Charbpos lstart = dl->charpos + dl->offset; |
| 5971 Charbpos lend = dl->end_charpos + dl->offset; | |
| 428 | 5972 |
| 5973 if (beg_unchanged >= lstart && beg_unchanged <= lend) | |
| 5974 break; | |
| 5975 | |
| 5976 line++; | |
| 5977 } | |
| 5978 | |
| 5979 /* If the changes are below the visible area then if point hasn't | |
| 5980 moved return success otherwise fail in order to be safe. */ | |
| 5981 if (line > dla_end) | |
| 5982 return regenerate_window_extents_only_changed (w, startp, pointm, | |
| 5983 extent_beg_unchanged, | |
| 5984 extent_end_unchanged); | |
| 5985 else | |
| 5986 /* At this point we know what line the changes first affect. We | |
| 5987 now redraw that line. If the changes are contained within it | |
| 5988 we are going to succeed and can update just that one line. | |
| 5989 Otherwise we fail. If we fail we will have altered the desired | |
| 5990 structs which could lead to an assertion failure. However, if | |
| 5991 we fail the next thing that is going to happen is a full regen | |
| 5992 so we will actually end up being safe. */ | |
| 5993 { | |
| 5994 prop_block_dynarr *prop = NULL; | |
| 5995 struct display_line *cdl = Dynarr_atp (cdla, line); | |
| 5996 struct display_line *ddl = Dynarr_atp (ddla, line); | |
| 5997 | |
| 826 | 5998 assert (cdl->charpos == ddl->charpos); |
| 5999 assert (cdl->end_charpos == ddl->end_charpos); | |
| 428 | 6000 assert (cdl->offset == ddl->offset); |
| 6001 | |
| 442 | 6002 /* If the line continues to next display line, fail. */ |
| 6003 if (ddl->line_continuation) | |
| 6004 return 0; | |
| 428 | 6005 |
| 6006 /* If the line was generated using propagation data, fail. */ | |
| 6007 if (ddl->used_prop_data) | |
| 6008 return 0; | |
| 6009 | |
| 2286 | 6010 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset, |
| 6011 &prop, DESIRED_DISP); | |
| 428 | 6012 ddl->offset = 0; |
| 6013 | |
| 6014 /* If there is propagated stuff then it is pretty much a | |
| 4187 | 6015 guarantee that more than just the one line is affected. */ |
| 428 | 6016 if (prop) |
| 6017 { | |
| 6018 Dynarr_free (prop); | |
| 6019 return 0; | |
| 6020 } | |
| 6021 | |
| 442 | 6022 /* If the line continues to next display line, fail. */ |
| 6023 if (ddl->line_continuation) | |
| 6024 return 0; | |
| 428 | 6025 |
| 6026 /* If any line position parameters have changed or a | |
| 4187 | 6027 cursor has disappeared or disappeared, fail. */ |
| 428 | 6028 if (cdl->ypos != ddl->ypos |
| 6029 || cdl->ascent != ddl->ascent | |
| 6030 || cdl->descent != ddl->descent | |
| 6031 || cdl->top_clip != ddl->top_clip | |
| 6032 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1) | |
|
5617
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
6033 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1) |
|
b0d712bbc2a6
The "flush" face property.
Didier Verna <didier@xemacs.org>
parents:
5587
diff
changeset
|
6034 || cdl->clear_findex != ddl->clear_findex) |
| 428 | 6035 { |
| 6036 return 0; | |
| 6037 } | |
| 6038 | |
| 6039 /* If the changed area also ends on this line, then we may be in | |
| 4187 | 6040 business. Update everything and return success. */ |
| 826 | 6041 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos) |
| 428 | 6042 { |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6043 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
|
6044 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
|
6045 Fset_marker (w->last_start[DESIRED_DISP], make_fixnum (startp), |
| 428 | 6046 w->buffer); |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6047 Fset_marker (w->last_point[DESIRED_DISP], make_fixnum (pointm), |
| 428 | 6048 w->buffer); |
| 6049 | |
| 6050 if (ddl->cursor_elt != -1) | |
| 6051 { | |
| 6052 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt; | |
| 6053 w->last_point_y[DESIRED_DISP] = line; | |
| 6054 } | |
| 6055 | |
| 6056 redisplay_update_line (w, line, line, 1); | |
| 6057 regenerate_modeline (w); | |
| 6058 | |
| 6059 /* #### For now we just flush the cache until this has been | |
| 4187 | 6060 tested. After that is done, this should correct the |
| 6061 cache directly. */ | |
| 428 | 6062 Dynarr_reset (w->line_start_cache); |
| 6063 | |
| 6064 /* Adjust the extent changed boundaries to remove any | |
| 4187 | 6065 overlap with the buffer changes since we've just |
| 6066 successfully updated that area. */ | |
| 428 | 6067 if (extent_beg_unchanged != -1 |
| 6068 && extent_beg_unchanged >= beg_unchanged | |
| 6069 && extent_beg_unchanged < end_unchanged) | |
| 6070 extent_beg_unchanged = end_unchanged; | |
| 6071 | |
| 6072 if (extent_end_unchanged != -1 | |
| 6073 && extent_end_unchanged >= beg_unchanged | |
| 6074 && extent_end_unchanged < end_unchanged) | |
| 6075 extent_end_unchanged = beg_unchanged - 1; | |
| 6076 | |
| 6077 if (extent_end_unchanged <= extent_beg_unchanged) | |
| 6078 extent_beg_unchanged = extent_end_unchanged = -1; | |
| 6079 | |
| 6080 /* This could lead to odd results if it fails, but since the | |
| 4187 | 6081 buffer changes update succeeded this probably will to. |
| 6082 We already know that the extent changes start at or after | |
| 6083 the line because we checked before entering the loop. */ | |
| 428 | 6084 if (extent_beg_unchanged != -1 |
| 6085 && extent_end_unchanged != -1 | |
| 826 | 6086 && ((extent_beg_unchanged < ddl->charpos) |
| 6087 || (extent_end_unchanged > ddl->end_charpos))) | |
| 428 | 6088 return regenerate_window_extents_only_changed (w, startp, pointm, |
| 6089 extent_beg_unchanged, | |
| 6090 extent_end_unchanged); | |
| 6091 else | |
| 6092 return 1; | |
| 6093 } | |
| 6094 } | |
| 6095 | |
| 6096 /* Oh, well. */ | |
| 6097 return 0; | |
| 6098 } | |
| 6099 | |
| 6100 /* Given a window and a point, update the given display lines such | |
| 6101 that point is displayed in the middle of the window. | |
| 6102 Return the window's new start position. */ | |
| 6103 | |
| 665 | 6104 static Charbpos |
| 6105 regenerate_window_point_center (struct window *w, Charbpos point, int type) | |
| 428 | 6106 { |
| 665 | 6107 Charbpos startp; |
| 428 | 6108 |
| 6109 /* We need to make sure that the modeline is generated so that the | |
| 6110 window height can be calculated correctly. */ | |
| 6111 ensure_modeline_generated (w, type); | |
| 6112 | |
| 6113 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w)); | |
| 6114 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
|
6115 Fset_marker (w->start[type], make_fixnum (startp), w->buffer); |
| 428 | 6116 |
| 6117 return startp; | |
| 6118 } | |
| 6119 | |
| 6120 /* Given a window and a set of display lines, return a boolean | |
| 6121 indicating whether the given point is contained within. */ | |
| 6122 | |
| 6123 static int | |
| 665 | 6124 point_visible (struct window *w, Charbpos point, int type) |
| 428 | 6125 { |
| 6126 struct buffer *b = XBUFFER (w->buffer); | |
| 6127 display_line_dynarr *dla = window_display_lines (w, type); | |
| 6128 int first_line; | |
| 6129 | |
| 4967 | 6130 if (Dynarr_length (dla) && Dynarr_begin (dla)->modeline) |
| 428 | 6131 first_line = 1; |
| 6132 else | |
| 6133 first_line = 0; | |
| 6134 | |
| 6135 if (Dynarr_length (dla) > first_line) | |
| 6136 { | |
| 665 | 6137 Charbpos start, end; |
| 428 | 6138 struct display_line *dl = Dynarr_atp (dla, first_line); |
| 6139 | |
| 826 | 6140 start = dl->charpos; |
| 428 | 6141 end = BUF_Z (b) - w->window_end_pos[type] - 1; |
| 6142 | |
| 6143 if (point >= start && point <= end) | |
| 6144 { | |
| 6145 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines) | |
| 6146 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
6147 dl = Dynarr_lastp (dla); |
| 428 | 6148 |
| 826 | 6149 if (point >= (dl->charpos + dl->offset) |
| 6150 && point <= (dl->end_charpos + dl->offset)) | |
| 428 | 6151 return !dl->clip; |
| 6152 else | |
| 6153 return 1; | |
| 6154 } | |
| 6155 else | |
| 6156 return 1; | |
| 6157 } | |
| 6158 else | |
| 6159 return 0; | |
| 6160 } | |
| 6161 else | |
| 6162 return 0; | |
| 6163 } | |
| 6164 | |
| 6165 /* Return pixel position the middle of the window, not including the | |
| 6166 modeline and any potential horizontal scrollbar. */ | |
| 6167 | |
| 6168 int | |
| 6169 window_half_pixpos (struct window *w) | |
| 6170 { | |
| 6171 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1); | |
| 6172 } | |
| 6173 | |
| 6174 /* Return the display line which is currently in the middle of the | |
| 6175 window W for display lines TYPE. */ | |
| 6176 | |
| 6177 int | |
| 665 | 6178 line_at_center (struct window *w, int type, Charbpos start, Charbpos point) |
| 428 | 6179 { |
| 6180 display_line_dynarr *dla; | |
| 6181 int half; | |
| 6182 int elt; | |
| 6183 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1); | |
| 6184 | |
| 6185 if (type == CMOTION_DISP) | |
| 6186 regenerate_window (w, start, point, type); | |
| 6187 | |
| 6188 dla = window_display_lines (w, type); | |
| 6189 half = window_half_pixpos (w); | |
| 6190 | |
| 6191 for (elt = first_elt; elt < Dynarr_length (dla); elt++) | |
| 6192 { | |
| 6193 struct display_line *dl = Dynarr_atp (dla, elt); | |
| 6194 int line_bot = dl->ypos + dl->descent; | |
| 6195 | |
| 6196 if (line_bot > half) | |
| 6197 return elt; | |
| 6198 } | |
| 6199 | |
| 6200 /* We may not have a line at the middle if the end of the buffer is | |
| 6201 being displayed. */ | |
| 6202 return -1; | |
| 6203 } | |
| 6204 | |
| 6205 /* Return a value for point that would place it at the beginning of | |
| 6206 the line which is in the middle of the window. */ | |
| 6207 | |
| 665 | 6208 Charbpos |
| 6209 point_at_center (struct window *w, int type, Charbpos start, Charbpos point) | |
| 428 | 6210 { |
| 6211 /* line_at_center will regenerate the display structures, if necessary. */ | |
| 6212 int line = line_at_center (w, type, start, point); | |
| 6213 | |
| 6214 if (line == -1) | |
| 6215 return BUF_ZV (XBUFFER (w->buffer)); | |
| 6216 else | |
| 6217 { | |
| 6218 display_line_dynarr *dla = window_display_lines (w, type); | |
| 6219 struct display_line *dl = Dynarr_atp (dla, line); | |
| 6220 | |
| 826 | 6221 return dl->charpos; |
| 428 | 6222 } |
| 6223 } | |
| 6224 | |
| 6225 /* For a given window, ensure that the current visual representation | |
| 6226 is accurate. */ | |
| 6227 | |
| 6228 static void | |
| 6229 redisplay_window (Lisp_Object window, int skip_selected) | |
| 6230 { | |
| 6231 struct window *w = XWINDOW (window); | |
| 6232 struct frame *f = XFRAME (w->frame); | |
| 6233 struct device *d = XDEVICE (f->device); | |
| 6234 Lisp_Object old_buffer = w->buffer; | |
| 6235 Lisp_Object the_buffer = w->buffer; | |
| 6236 struct buffer *b; | |
| 6237 int echo_active = 0; | |
| 6238 int startp = 1; | |
| 6239 int pointm; | |
| 6240 int old_startp = 1; | |
| 6241 int old_pointm = 1; | |
| 6242 int selected_in_its_frame; | |
| 6243 int selected_globally; | |
| 6244 int skip_output = 0; | |
| 6245 int truncation_changed; | |
| 6246 int inactive_minibuffer = | |
| 6247 (MINI_WINDOW_P (w) && | |
| 6248 (f != device_selected_frame (d)) && | |
| 6249 !is_surrogate_for_selected_frame (f)); | |
| 6250 | |
| 6251 /* #### In the new world this function actually does a bunch of | |
| 6252 optimizations such as buffer-based scrolling, but none of that is | |
| 6253 implemented yet. */ | |
| 6254 | |
| 6255 /* If this is a combination window, do its children; that's all. | |
| 6256 The selected window is always a leaf so we don't check for | |
| 6257 skip_selected here. */ | |
| 6258 if (!NILP (w->vchild)) | |
| 6259 { | |
| 6260 redisplay_windows (w->vchild, skip_selected); | |
| 6261 return; | |
| 6262 } | |
| 6263 if (!NILP (w->hchild)) | |
| 6264 { | |
| 6265 redisplay_windows (w->hchild, skip_selected); | |
| 6266 return; | |
| 6267 } | |
| 6268 | |
| 6269 /* Is this window the selected window on its frame? */ | |
| 6270 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f))); | |
| 6271 selected_globally = | |
| 6272 selected_in_its_frame && | |
| 5198 | 6273 EQ (DEVICE_CONSOLE (d), Vselected_console) && |
| 6274 XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d && | |
| 6275 XFRAME (DEVICE_SELECTED_FRAME (d)) == f; | |
| 428 | 6276 if (skip_selected && selected_in_its_frame) |
| 6277 return; | |
| 6278 | |
| 6279 /* It is possible that the window is not fully initialized yet. */ | |
| 6280 if (NILP (w->buffer)) | |
| 6281 return; | |
| 6282 | |
| 6283 if (MINI_WINDOW_P (w) && echo_area_active (f)) | |
| 6284 { | |
| 6285 w->buffer = the_buffer = Vecho_area_buffer; | |
| 6286 echo_active = 1; | |
| 6287 } | |
| 6288 | |
| 6289 b = XBUFFER (w->buffer); | |
| 6290 | |
| 6291 if (echo_active) | |
| 6292 { | |
| 6293 old_pointm = selected_globally | |
| 4187 | 6294 ? BUF_PT (b) |
| 6295 : marker_position (w->pointm[CURRENT_DISP]); | |
| 428 | 6296 pointm = 1; |
| 6297 } | |
| 6298 else | |
| 6299 { | |
| 6300 if (selected_globally) | |
| 6301 { | |
| 6302 pointm = BUF_PT (b); | |
| 6303 } | |
| 6304 else | |
| 6305 { | |
| 6306 pointm = marker_position (w->pointm[CURRENT_DISP]); | |
| 6307 | |
| 6308 if (pointm < BUF_BEGV (b)) | |
| 6309 pointm = BUF_BEGV (b); | |
| 6310 else if (pointm > BUF_ZV (b)) | |
| 6311 pointm = BUF_ZV (b); | |
| 6312 } | |
| 6313 } | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6314 Fset_marker (w->pointm[DESIRED_DISP], make_fixnum (pointm), the_buffer); |
| 428 | 6315 |
| 4968 | 6316 /* Added 2-1-10 -- we should never have empty face or glyph cachels |
| 6317 because we initialized them at startup and the only way to reduce | |
| 6318 their number is through calling reset_face_cachels() or | |
| 6319 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
|
6320 standard entries |
|
3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
5581
diff
changeset
|
6321 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
|
6322 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
|
6323 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
|
6324 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
|
6325 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
|
6326 the minibuffer window (this part is confirmed), and thus this assert. */ |
| 4968 | 6327 assert (Dynarr_length (w->face_cachels)); |
| 6328 assert (Dynarr_length (w->glyph_cachels)); | |
| 6329 | |
| 428 | 6330 /* If the buffer has changed we have to invalidate all of our face |
| 6331 cache elements. */ | |
| 6332 if ((!echo_active && b != window_display_buffer (w)) | |
| 6333 || f->faces_changed) | |
| 6334 reset_face_cachels (w); | |
| 6335 else | |
| 6336 mark_face_cachels_as_not_updated (w); | |
| 6337 | |
| 6338 /* Ditto the glyph cache elements, although we do *not* invalidate | |
| 6339 the cache purely because glyphs have changed - this is now | |
| 6340 handled by the dirty flag.*/ | |
| 6341 if ((!echo_active && b != window_display_buffer (w)) | |
| 4968 | 6342 || f->faces_changed) |
| 428 | 6343 reset_glyph_cachels (w); |
| 6344 else | |
| 6345 mark_glyph_cachels_as_not_updated (w); | |
| 6346 | |
| 6347 /* If the marker's buffer is not the window's buffer, then we need | |
| 6348 to find a new starting position. */ | |
| 6349 if (!MINI_WINDOW_P (w) | |
| 6350 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer)) | |
| 6351 { | |
| 6352 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP); | |
| 6353 | |
| 6354 goto regeneration_done; | |
| 6355 } | |
| 6356 | |
| 6357 if (echo_active) | |
| 6358 { | |
| 6359 old_startp = marker_position (w->start[CURRENT_DISP]); | |
| 6360 startp = 1; | |
| 6361 } | |
| 6362 else | |
| 6363 { | |
| 6364 startp = marker_position (w->start[CURRENT_DISP]); | |
| 6365 if (startp < BUF_BEGV (b)) | |
| 6366 startp = BUF_BEGV (b); | |
| 6367 else if (startp > BUF_ZV (b)) | |
| 6368 startp = BUF_ZV (b); | |
| 6369 } | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6370 Fset_marker (w->start[DESIRED_DISP], make_fixnum (startp), the_buffer); |
| 428 | 6371 |
| 6372 truncation_changed = (find_window_mirror (w)->truncate_win != | |
| 647 | 6373 (unsigned int) window_truncation_on (w)); |
| 428 | 6374 |
| 6375 /* If w->force_start is set, then some function set w->start and we | |
| 6376 should display from there and change point, if necessary, to | |
| 6377 ensure that it is visible. */ | |
| 6378 if (w->force_start || inactive_minibuffer) | |
| 6379 { | |
| 6380 w->force_start = 0; | |
| 6381 w->last_modified[DESIRED_DISP] = Qzero; | |
| 6382 w->last_facechange[DESIRED_DISP] = Qzero; | |
| 6383 | |
| 6384 regenerate_window (w, startp, pointm, DESIRED_DISP); | |
| 6385 | |
| 6386 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer) | |
| 6387 { | |
| 6388 pointm = point_at_center (w, DESIRED_DISP, 0, 0); | |
| 6389 | |
| 6390 if (selected_globally) | |
| 6391 BUF_SET_PT (b, pointm); | |
| 6392 | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6393 Fset_marker (w->pointm[DESIRED_DISP], make_fixnum (pointm), |
| 428 | 6394 the_buffer); |
| 6395 | |
| 6396 /* #### BUFU amounts of overkill just to get the cursor | |
| 4187 | 6397 location marked properly. FIX ME FIX ME FIX ME */ |
| 428 | 6398 regenerate_window (w, startp, pointm, DESIRED_DISP); |
| 6399 } | |
| 6400 | |
| 6401 goto regeneration_done; | |
| 6402 } | |
| 6403 | |
| 6404 /* If nothing has changed since the last redisplay, then we just | |
| 6405 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
|
6406 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
|
6407 && XFIXNUM (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b) |
| 428 | 6408 && pointm >= startp |
| 6409 /* This check is to make sure we restore the minibuffer after a | |
| 4187 | 6410 temporary change to the echo area. */ |
| 428 | 6411 && !(MINI_WINDOW_P (w) && f->buffers_changed) |
| 6412 && !f->frame_changed | |
| 6413 && !truncation_changed | |
| 442 | 6414 /* check whether start is really at the beginning of a line GE */ |
| 428 | 6415 && (!w->start_at_line_beg || beginning_of_line_p (b, startp)) |
| 6416 ) | |
| 6417 { | |
| 6418 /* Check if the cursor has actually moved. */ | |
| 6419 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer) | |
| 6420 && pointm == marker_position (w->last_point[CURRENT_DISP]) | |
| 6421 && selected_globally | |
| 6422 && !w->windows_changed | |
| 6423 && !f->clip_changed | |
| 6424 && !f->extents_changed | |
| 6425 && !f->faces_changed | |
| 6426 && !f->glyphs_changed | |
| 6427 && !f->subwindows_changed | |
| 442 | 6428 /* && !f->subwindows_state_changed*/ |
| 428 | 6429 && !f->point_changed |
| 6430 && !f->windows_structure_changed) | |
| 6431 { | |
| 6432 /* If not, we're done. */ | |
| 6433 if (f->modeline_changed) | |
| 6434 regenerate_modeline (w); | |
| 6435 | |
| 6436 skip_output = 1; | |
| 6437 goto regeneration_done; | |
| 6438 } | |
| 6439 else | |
| 6440 { | |
| 6441 /* If the new point is visible in the redisplay structures, | |
| 4187 | 6442 then let the output update routines handle it, otherwise |
| 6443 do things the hard way. */ | |
| 428 | 6444 if (!w->windows_changed |
| 6445 && !f->clip_changed | |
| 6446 && !f->extents_changed | |
| 6447 && !f->faces_changed | |
| 6448 && !f->glyphs_changed | |
| 6449 && !f->subwindows_changed | |
| 442 | 6450 /* && !f->subwindows_state_changed*/ |
| 428 | 6451 && !f->windows_structure_changed) |
| 6452 { | |
| 6453 if (point_visible (w, pointm, CURRENT_DISP) | |
| 6454 && w->last_point_x[CURRENT_DISP] != -1 | |
| 6455 && w->last_point_y[CURRENT_DISP] != -1) | |
| 6456 { | |
| 6457 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f))) | |
| 6458 { | |
| 6459 /* Always regenerate in case it is displaying | |
| 4187 | 6460 the current line or column. */ |
| 428 | 6461 regenerate_modeline (w); |
| 6462 | |
| 6463 skip_output = 1; | |
| 6464 goto regeneration_done; | |
| 6465 } | |
| 6466 } | |
| 6467 else if (!selected_in_its_frame && !f->point_changed) | |
| 6468 { | |
| 6469 if (f->modeline_changed) | |
| 6470 regenerate_modeline (w); | |
| 6471 | |
| 6472 skip_output = 1; | |
| 6473 goto regeneration_done; | |
| 6474 } | |
| 6475 } | |
| 6476 | |
| 6477 /* If we weren't able to take the shortcut method, then use | |
| 4187 | 6478 the brute force method. */ |
| 428 | 6479 regenerate_window (w, startp, pointm, DESIRED_DISP); |
| 6480 | |
| 6481 if (point_visible (w, pointm, DESIRED_DISP)) | |
| 6482 goto regeneration_done; | |
| 6483 } | |
| 6484 } | |
| 6485 | |
| 6486 /* Check if the starting point is no longer at the beginning of a | |
| 6487 line, in which case find a new starting point. We also recenter | |
| 6488 if our start position is equal to point-max. Otherwise we'll end | |
| 6489 up with a blank window. */ | |
| 6490 else if (((w->start_at_line_beg || MINI_WINDOW_P (w)) | |
| 6491 && !(startp == BUF_BEGV (b) | |
| 6492 || BUF_FETCH_CHAR (b, startp - 1) == '\n')) | |
| 6493 || (pointm == startp && | |
| 6494 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) && | |
| 6495 startp < marker_position (w->last_start[CURRENT_DISP])) | |
| 6496 || (startp == BUF_ZV (b))) | |
| 6497 { | |
| 6498 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP); | |
| 6499 | |
| 6500 goto regeneration_done; | |
| 6501 } | |
| 6502 /* See if we can update the data structures locally based on | |
| 6503 knowledge of what changed in the buffer. */ | |
| 6504 else if (!w->windows_changed | |
| 6505 && !f->clip_changed | |
| 6506 && !f->faces_changed | |
| 6507 && !f->glyphs_changed | |
| 6508 && !f->subwindows_changed | |
| 442 | 6509 /* && !f->subwindows_state_changed*/ |
| 428 | 6510 && !f->windows_structure_changed |
| 6511 && !f->frame_changed | |
| 6512 && !truncation_changed | |
| 6513 && pointm >= startp | |
| 6514 && regenerate_window_incrementally (w, startp, pointm)) | |
| 6515 { | |
| 6516 if (f->modeline_changed | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6517 || 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
|
6518 || XFIXNUM (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b)) |
| 428 | 6519 regenerate_modeline (w); |
| 6520 | |
| 6521 skip_output = 1; | |
| 6522 goto regeneration_done; | |
| 6523 } | |
| 6524 /* #### This is where a check for structure based scrolling would go. */ | |
| 6525 /* If all else fails, try just regenerating and see what happens. */ | |
| 6526 else | |
| 6527 { | |
| 6528 regenerate_window (w, startp, pointm, DESIRED_DISP); | |
| 6529 | |
| 6530 if (point_visible (w, pointm, DESIRED_DISP)) | |
| 6531 goto regeneration_done; | |
| 6532 } | |
| 6533 | |
| 6534 /* We still haven't gotten the window regenerated with point | |
| 6535 visible. Next we try scrolling a little and see if point comes | |
| 6536 back onto the screen. */ | |
| 6537 if (scroll_step > 0) | |
| 6538 { | |
| 6539 int scrolled = scroll_conservatively; | |
| 6540 for (; scrolled >= 0; scrolled -= scroll_step) | |
| 6541 { | |
| 6542 startp = vmotion (w, startp, | |
| 6543 (pointm < startp) ? -scroll_step : scroll_step, 0); | |
| 6544 regenerate_window (w, startp, pointm, DESIRED_DISP); | |
| 6545 | |
| 6546 if (point_visible (w, pointm, DESIRED_DISP)) | |
| 6547 goto regeneration_done; | |
| 6548 } | |
| 6549 } | |
| 6550 | |
| 6551 /* We still haven't managed to get the screen drawn with point on | |
| 6552 the screen, so just center it and be done with it. */ | |
| 6553 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP); | |
| 6554 | |
| 6555 | |
| 6556 regeneration_done: | |
| 6557 | |
| 6558 /* If the window's frame is changed then reset the current display | |
| 6559 lines in order to force a full repaint. */ | |
| 6560 if (f->frame_changed) | |
| 6561 { | |
| 6562 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP); | |
| 6563 | |
| 6564 Dynarr_reset (cla); | |
| 6565 } | |
| 6566 | |
| 6567 /* Must do this before calling redisplay_output_window because it | |
| 6568 sets some markers on the window. */ | |
| 6569 if (echo_active) | |
| 6570 { | |
| 6571 w->buffer = old_buffer; | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6572 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
|
6573 Fset_marker (w->start[DESIRED_DISP], make_fixnum (old_startp), old_buffer); |
| 428 | 6574 } |
| 6575 | |
| 6576 /* These also have to be set before calling redisplay_output_window | |
| 6577 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
|
6578 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
|
6579 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
|
6580 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
|
6581 Fset_marker (w->last_point[DESIRED_DISP], make_fixnum (pointm), w->buffer); |
| 428 | 6582 |
| 6583 if (!skip_output) | |
| 6584 { | |
| 665 | 6585 Charbpos start = marker_position (w->start[DESIRED_DISP]); |
| 6586 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1 | |
| 428 | 6587 ? BUF_ZV (b) |
| 6588 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1); | |
| 6589 /* Don't pollute the cache if not sure if we are correct */ | |
| 6590 if (w->start_at_line_beg) | |
| 6591 update_line_start_cache (w, start, end, pointm, 1); | |
| 6592 redisplay_output_window (w); | |
| 6593 /* | |
| 6594 * If we just displayed the echo area, the line start cache is | |
| 6595 * no longer valid, because the minibuffer window is associated | |
| 6596 * with the window now. | |
| 6597 */ | |
| 6598 if (echo_active) | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
6599 w->line_cache_last_updated = make_fixnum (-1); |
| 428 | 6600 } |
| 6601 | |
| 6602 /* #### This should be dependent on face changes and will need to be | |
| 6603 somewhere else once tty updates occur on a per-frame basis. */ | |
| 6604 mark_face_cachels_as_clean (w); | |
| 6605 | |
| 438 | 6606 /* The glyph cachels only get dirty if someone changed something. |
| 6607 Since redisplay has now effectively ended we can reset the dirty | |
| 6608 flag since everything must be up-to-date. */ | |
| 428 | 6609 if (glyphs_changed) |
| 6610 mark_glyph_cachels_as_clean (w); | |
| 6611 | |
| 6612 w->windows_changed = 0; | |
| 6613 } | |
| 6614 | |
| 6615 /* Call buffer_reset_changes for all buffers present in any window | |
| 6616 currently visible in all frames on all devices. #### There has to | |
| 6617 be a better way to do this. */ | |
| 6618 | |
| 6619 static int | |
| 2286 | 6620 reset_buffer_changes_mapfun (struct window *w, void *UNUSED (closure)) |
| 428 | 6621 { |
| 6622 buffer_reset_changes (XBUFFER (w->buffer)); | |
| 6623 return 0; | |
| 6624 } | |
| 6625 | |
| 6626 static void | |
| 6627 reset_buffer_changes (void) | |
| 6628 { | |
| 6629 Lisp_Object frmcons, devcons, concons; | |
| 6630 | |
| 6631 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) | |
| 6632 { | |
| 6633 struct frame *f = XFRAME (XCAR (frmcons)); | |
| 6634 | |
| 6635 if (FRAME_REPAINT_P (f)) | |
| 6636 map_windows (f, reset_buffer_changes_mapfun, 0); | |
| 6637 } | |
| 6638 } | |
| 6639 | |
| 6640 /* Ensure that all windows underneath the given window in the window | |
| 6641 hierarchy are correctly displayed. */ | |
| 6642 | |
| 6643 static void | |
| 6644 redisplay_windows (Lisp_Object window, int skip_selected) | |
| 6645 { | |
| 6646 for (; !NILP (window) ; window = XWINDOW (window)->next) | |
| 6647 { | |
| 6648 redisplay_window (window, skip_selected); | |
| 6649 } | |
| 6650 } | |
| 6651 | |
| 1318 | 6652 /* Register an action to be called at the end of redisplay. |
| 6653 in_display is 0 when this is called. | |
| 6654 This is used when it is discovered that an action needs to be taken, | |
| 6655 but it's during redisplay, so it's not safe. (Typically, it's an action | |
| 6656 that needs to enter redisplay, which can't happen reentrantly.) | |
| 6657 | |
| 6658 NEVER signal an error in these functions. | |
| 6659 */ | |
| 6660 | |
| 6661 void | |
| 6662 register_post_redisplay_action (void (*fun) (Lisp_Object), Lisp_Object arg) | |
| 6663 { | |
| 6664 Vpost_redisplay_actions = nconc2 (Vpost_redisplay_actions, | |
| 6665 list1 (Fcons (make_opaque_ptr | |
| 6666 ((void *) fun), arg))); | |
| 6667 } | |
| 6668 | |
| 1320 | 6669 static int running_post_redisplay_actions; |
| 6670 | |
| 1318 | 6671 static void |
| 6672 run_post_redisplay_actions (void) | |
| 6673 { | |
| 1320 | 6674 int depth; |
| 6675 | |
| 6676 if (running_post_redisplay_actions) | |
| 6677 return; | |
| 6678 | |
| 6679 depth = internal_bind_int (&running_post_redisplay_actions, 1); | |
| 6680 /* If the function pushes further actions, they will be tacked onto | |
| 6681 the end of the list, and we'll run them when we're done with the | |
| 6682 current ones. */ | |
| 1318 | 6683 while (!NILP (Vpost_redisplay_actions)) |
| 6684 { | |
| 6685 Lisp_Object car = XCAR (Vpost_redisplay_actions); | |
| 6686 void (*fun) (Lisp_Object) = | |
| 6687 (void (*)(Lisp_Object)) get_opaque_ptr (XCAR (car)); | |
| 6688 (*fun) (XCDR (car)); | |
| 6689 free_opaque_ptr (XCAR (car)); | |
| 6690 free_cons (car); | |
| 6691 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions); | |
| 6692 } | |
| 1320 | 6693 unbind_to (depth); |
| 1318 | 6694 } |
| 6695 | |
|
5348
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6696 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
|
6697 |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6698 void |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6699 redisplay_cancel_ritual_suicide(void) |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6700 { |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6701 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
|
6702 } |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6703 |
| 1318 | 6704 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS |
| 6705 | |
| 6706 static Lisp_Object | |
| 2286 | 6707 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe)) |
| 1318 | 6708 { |
|
5348
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6709 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
|
6710 { |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6711 assert (!in_display); |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6712 } |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6713 else |
|
39304a35b6b3
Don't commit suicide when an X device dies.
Mike Sperber <sperber@deinprogramm.de>
parents:
5198
diff
changeset
|
6714 the_ritual_suicide_has_been_cancelled = 0; |
| 1318 | 6715 return Qnil; |
| 6716 } | |
| 6717 | |
| 6718 #endif | |
| 6719 | |
| 6720 /* Within the guts of redisplay, we are defenseless and cannot allow any of | |
| 6721 the following to happen: | |
| 6722 | |
| 6723 1) garbage collection | |
| 6724 2) QUIT | |
| 6725 3) any non-local exits | |
| 6726 4) frame size changes | |
| 6727 5) deletion of any buffers, windows, frames, etc. | |
| 6728 6) modification of buffer text | |
| 6729 7) reentrant entry of redisplay (see the stack trace above | |
| 6730 generate_displayable_area()) | |
| 6731 | |
| 6732 The general reason is that the redisplay code is written to assume that | |
| 6733 it is the only code running, and thus (a) cannot tolerate structures | |
| 6734 changed out from under it (hence 1, 4, 5, 6, 7) and (b) at various points | |
| 6735 within redisplay the redisplay structures may be in an inconsistent | |
| 6736 state and there are no unwind-protects to clean the structures up in | |
| 6737 case of non-local exit (hence 2, 3). Fixing redisplay to address these | |
| 6738 issues is hard and perhaps not worth it (and might slow things down a | |
| 6739 fair amount). We address 1, 4, 5 and 6 ourselves inside of | |
| 6740 enter_redisplay_critical_section() by simply inhibiting them, but we | |
| 6741 cannot handle 2 and 3, which must be handled at the actual point where | |
| 6742 they may occur (especially, internal_equal() or any place that may call | |
| 6743 Lisp), by wrapping the code in call_trapping_problems() or | |
| 6744 call_with_suspended_errors(). [[ NOTE: We could address QUIT by inhibiting | |
| 6745 it but this would be anti-social because it would prevent the user from | |
| 6746 interrupting any Lisp code called within the critical section. With the | |
| 6747 call_*() wrapping, C-g will interrupt the Lisp code and throw back to | |
| 6748 the innermost wrapping. ]] In fact we do turn off QUIT handling, since | |
| 6749 it's just too dangerous otherwise. See below. | |
| 6750 | |
| 6751 Code calling enter_redisplay_critical_section() must check for reentrancy | |
| 6752 (#7) and take appropriate corrective action. | |
| 6753 | |
| 6754 To help debug potential problems, we arrange (when | |
| 6755 ERROR_CHECK_TRAPPING_PROBLEMS is set) to crash automatically every time | |
| 6756 we execute QUIT or call Lisp code unless proper wrapping is in place, as | |
| 6757 well as further checks when we actually Fsignal(), Fthrow(), | |
| 6758 garbage_collect_1(). | |
| 6759 | |
| 6760 #### If a frame-size change does occur we should probably actually be | |
| 6761 preempting redisplay. */ | |
| 6762 | |
| 6763 /* Count of number of recursive times we call | |
| 6764 enter_redisplay_critical_section() or | |
| 6765 enter_redisplay_critical_section_maybe(). | |
| 6766 enter_redisplay_critical_section() cannot occur reentrantly but we have | |
| 6767 to know in the *maybe() version whether to exit the section when we're | |
| 6768 done. */ | |
| 6769 static int in_display_nesting; | |
| 6770 | |
| 6771 static Lisp_Object | |
| 2286 | 6772 end_hold_frame_size_changes (Lisp_Object UNUSED (obj)) |
| 1318 | 6773 { |
| 6774 if (!hold_frame_size_changes) | |
| 6775 { | |
| 6776 /* we used to have a function to do this for only one frame, and | |
| 6777 it was typical to call it at the end of a critical section | |
| 6778 (which occurs once per frame); but what then happens if multiple | |
| 6779 frames have frame changes held up? | |
| 4187 | 6780 |
| 1318 | 6781 This means we are O(N^2) over frames. I seriously doubt it matters. |
| 6782 --ben */ | |
| 6783 Lisp_Object frmcons, devcons, concons; | |
| 4187 | 6784 |
| 1318 | 6785 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) |
| 6786 { | |
| 6787 struct frame *f = XFRAME (XCAR (frmcons)); | |
| 6788 if (f->size_change_pending) | |
| 5043 | 6789 change_frame_size (f, f->new_width, f->new_height, 0); |
| 1318 | 6790 } |
| 6791 } | |
| 6792 return Qnil; | |
| 6793 } | |
| 6794 | |
| 6795 /* Call this to temporarily prevent frame-size changes from being processed. | |
| 6796 To undo, use unbind_to(), passing it the value returned by this function. | |
| 6797 */ | |
| 6798 | |
| 6799 int | |
| 6800 begin_hold_frame_size_changes (void) | |
| 6801 { | |
| 6802 int depth = specpdl_depth (); | |
| 6803 record_unwind_protect (end_hold_frame_size_changes, Qnil); | |
| 6804 internal_bind_int (&hold_frame_size_changes, 1 + hold_frame_size_changes); | |
| 6805 return depth; | |
| 6806 } | |
| 6807 | |
| 6808 int | |
| 6809 enter_redisplay_critical_section (void) | |
| 6810 { | |
| 6811 int depth = specpdl_depth (); | |
| 6812 | |
| 6813 /* Reentrant entry is deadly. The calling function must check for this. */ | |
| 6814 assert (!in_display); | |
| 6815 begin_hold_frame_size_changes (); | |
| 6816 /* Make sure in_display gets reset, but don't set it yet so that | |
| 6817 commit_ritual_suicide() can be used. */ | |
| 6818 internal_bind_int (&in_display, 0); | |
| 6819 internal_bind_int (&in_display_nesting, 1 + in_display_nesting); | |
| 6820 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS | |
| 6821 /* Force every call to QUIT to check for in_displayness. This will | |
| 6822 verify proper wrapping, as in the previous comment, aborting if not. */ | |
| 6823 something_happened++; | |
| 6824 /* Verify that no nonlocal exits blow past us. */ | |
| 6825 record_unwind_protect (commit_ritual_suicide, Qnil); | |
| 6826 #endif | |
| 6827 in_display++; | |
| 6828 | |
| 6829 set_trapping_problems_flags (INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY); | |
| 6830 /* Even checking for QUIT can cause arbitrary Lisp code to be executed, | |
| 6831 e.g. through a menu handler. We really don't want that happening | |
| 6832 inside of redisplay. Code that we `eval' is at least written with the | |
| 6833 expectation that it's inside of redisplay, and shouldn't try anything | |
| 6834 weird; but that's not the case for menu code (e.g. custom loads huge | |
| 6835 amounts of LISP FILES from a menu handler! FMH!). Safest just to turn | |
| 6836 this off. We could turn it on using UNINHIBIT_QUIT or | |
| 6837 begin_do_check_for_quit() in certain places if we want, if we know | |
| 6838 it's not in an especially tricky place. */ | |
| 6839 begin_dont_check_for_quit (); | |
| 6840 return depth; | |
| 6841 } | |
| 6842 | |
| 6843 void | |
| 6844 exit_redisplay_critical_section (int depth) | |
| 6845 { | |
| 6846 in_display--; | |
| 6847 assert (!in_display); | |
| 6848 unbind_to (depth); | |
| 6849 | |
| 6850 run_post_redisplay_actions (); | |
| 6851 } | |
| 6852 | |
| 6853 /* Enter the redisplay critical section if we're not already in it. This | |
| 6854 is for code that needs frame changes held up and other protections from | |
| 6855 being inside, but doesn't modify the redisplay structures, and doesn't | |
| 6856 look at them in a way that they will be confused by inconsistencies. */ | |
| 6857 | |
| 6858 int | |
| 6859 enter_redisplay_critical_section_maybe (void) | |
| 6860 { | |
| 6861 if (!in_display) | |
| 6862 return enter_redisplay_critical_section (); | |
| 6863 else | |
| 6864 return internal_bind_int (&in_display_nesting, 1 + in_display_nesting); | |
| 6865 } | |
| 6866 | |
| 6867 void | |
| 6868 exit_redisplay_critical_section_maybe (int depth) | |
| 6869 { | |
| 6870 if (in_display_nesting == 1) | |
| 6871 exit_redisplay_critical_section (depth); | |
| 6872 else | |
| 6873 unbind_to (depth); | |
| 6874 } | |
| 6875 | |
| 1279 | 6876 /* Ensure that all windows on the given frame are correctly displayed. |
| 6877 Return non-zero if pre-empted. */ | |
| 428 | 6878 |
| 442 | 6879 int |
| 428 | 6880 redisplay_frame (struct frame *f, int preemption_check) |
| 6881 { | |
| 6882 struct device *d = XDEVICE (f->device); | |
| 853 | 6883 int depth; |
| 428 | 6884 |
| 1279 | 6885 assert (f->init_finished); |
| 6886 | |
| 1318 | 6887 /* NOTE: Without sufficient checks for stream frames, we got weird |
| 6888 crashes in pdump. These came and went very easily -- adding the | |
| 6889 critical-section code for redisplay was enough to trigger them. | |
| 6890 Perhaps I should have debugged them but there didn't seem to be any | |
| 6891 point. --ben */ | |
| 1279 | 6892 if (FRAME_STREAM_P (f)) /* nothing to do */ |
| 6893 return 0; | |
| 6894 | |
| 1318 | 6895 /* Reentrancy into redisplay can be deadly. See stack trace above |
| 6896 generate_displayable_area(). */ | |
| 6897 if (in_display) | |
| 6898 return 1; | |
| 6899 | |
| 545 | 6900 if (preemption_check |
| 6901 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY)) | |
| 428 | 6902 { |
| 6903 /* The preemption check itself takes a lot of time, | |
| 6904 so normally don't do it here. We do it if called | |
| 6905 from Lisp, though (`redisplay-frame'). */ | |
| 6906 int preempted; | |
| 6907 | |
| 6908 REDISPLAY_PREEMPTION_CHECK; | |
| 6909 if (preempted) | |
| 6910 return 1; | |
| 6911 } | |
| 6912 | |
| 442 | 6913 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0)) |
| 6914 { | |
| 6915 Lisp_Object frame; | |
| 6916 | |
| 6917 f->old_buffer_alist = Freplace_list (f->old_buffer_alist, | |
| 6918 f->buffer_alist); | |
| 793 | 6919 frame = wrap_frame (f); |
| 442 | 6920 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame); |
| 6921 } | |
| 6922 | |
| 428 | 6923 /* Before we put a hold on frame size changes, attempt to process |
| 6924 any which are already pending. */ | |
| 6925 if (f->size_change_pending) | |
| 5043 | 6926 change_frame_size (f, f->new_width, f->new_height, 0); |
| 428 | 6927 |
| 6928 /* If frame size might need to be changed, due to changed size | |
| 6929 of toolbars, scrollbars etc, change it now */ | |
| 6930 if (f->size_slipped) | |
| 6931 { | |
| 6932 adjust_frame_size (f); | |
| 6933 assert (!f->size_slipped); | |
| 6934 } | |
| 6935 | |
| 1318 | 6936 /* The menubar, toolbar, and icon updates should be done before |
| 853 | 6937 enter_redisplay_critical_section is called and we are officially |
| 3025 | 6938 `in_display'. They is because they tend to eval Lisp code, which |
| 1318 | 6939 needs to be carefully wrapped within the critical section (and hence |
| 6940 is difficult to debug). */ | |
| 428 | 6941 |
| 6942 #ifdef HAVE_MENUBARS | |
| 6943 /* Update the menubar. It is done first since it could change | |
| 6944 the menubar's visibility. This way we avoid having flashing | |
| 6945 caused by an Expose event generated by the visibility change | |
| 6946 being handled. */ | |
| 6947 update_frame_menubars (f); | |
| 6948 #endif /* HAVE_MENUBARS */ | |
| 6949 #ifdef HAVE_TOOLBARS | |
| 905 | 6950 /* Update the toolbars geometry. We don't update the toolbars |
| 6951 themselves at this point since the space they are trying to | |
| 6952 occupy may currently by occupied by gutter elements. Instead we | |
| 6953 update the geometry, then update the gutter geometry, then update | |
| 6954 the gutters - which will cause mapped windows to be repositioned | |
| 6955 - and finally update the toolbars. */ | |
| 6956 update_frame_toolbars_geometry (f); | |
| 428 | 6957 #endif /* HAVE_TOOLBARS */ |
| 442 | 6958 /* Gutter update proper has to be done inside display when no frame |
| 6959 size changes can occur, thus we separately update the gutter | |
| 6960 geometry here if it needs it. */ | |
| 6961 update_frame_gutter_geometry (f); | |
| 428 | 6962 |
| 6963 /* If we clear the frame we have to force its contents to be redrawn. */ | |
| 6964 if (f->clear) | |
| 6965 f->frame_changed = 1; | |
| 6966 | |
| 442 | 6967 /* Invalidate the subwindow caches. We use subwindows_changed here |
| 6968 to cause subwindows to get instantiated. This is because | |
| 428 | 6969 subwindows_state_changed is less strict - dealing with things |
| 6970 like the clicked state of button. We have to do this before | |
| 6971 redisplaying the gutters as subwindows get unmapped in the | |
| 6972 process.*/ | |
| 442 | 6973 if (f->frame_changed) |
| 6974 reset_frame_subwindow_instance_cache (f); | |
| 6975 | |
| 6976 if (f->frame_changed || f->subwindows_changed) | |
| 6977 { | |
| 428 | 6978 /* we have to do this so the gutter gets regenerated. */ |
| 6979 reset_gutter_display_lines (f); | |
| 6980 } | |
| 6981 | |
| 853 | 6982 depth = enter_redisplay_critical_section (); |
| 428 | 6983 |
| 6984 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */ | |
| 1318 | 6985 |
| 6986 /* See comments in enter_redisplay_critical_section() */ | |
| 428 | 6987 |
| 442 | 6988 MAYBE_DEVMETH (d, frame_output_begin, (f)); |
| 6989 | |
| 6990 /* We can now update the gutters, safe in the knowledge that our | |
| 6991 efforts won't get undone. */ | |
| 6992 | |
| 6993 /* This can call lisp, but redisplay is protected by binding | |
| 6994 inhibit_quit. More importantly the code involving display lines | |
| 6995 *assumes* that GC will not happen and so does not GCPRO | |
| 6996 anything. Since we use this code the whole time with the gutters | |
| 1318 | 6997 we cannot allow GC to happen when manipulating the gutters. |
| 6998 | |
| 6999 This must be inside of the critical section for various reasons. | |
| 7000 For example, it messes with display structures, which be left in | |
| 7001 an inconsistent state. */ | |
| 442 | 7002 update_frame_gutters (f); |
| 7003 | |
| 428 | 7004 /* Erase the frame before outputting its contents. */ |
| 7005 if (f->clear) | |
| 7006 { | |
| 442 | 7007 MAYBE_DEVMETH (d, clear_frame, (f)); |
| 428 | 7008 } |
| 7009 | |
| 7010 /* Do the selected window first. */ | |
| 7011 redisplay_window (FRAME_SELECTED_WINDOW (f), 0); | |
| 7012 | |
| 7013 /* Then do the rest. */ | |
| 7014 redisplay_windows (f->root_window, 1); | |
| 7015 | |
| 442 | 7016 MAYBE_DEVMETH (d, frame_output_end, (f)); |
| 428 | 7017 |
| 7018 update_frame_title (f); | |
| 7019 | |
| 905 | 7020 #ifdef HAVE_TOOLBARS |
| 7021 /* Finally update the toolbars. It seems its possible to get in a | |
| 7022 cycle between updating the gutter and the toolbars. Basically we | |
| 7023 want to end up with both being up-to-date and this doesn't seem | |
| 7024 possible in a single pass. */ | |
| 7025 update_frame_toolbars (f); | |
| 7026 #endif /* HAVE_TOOLBARS */ | |
| 7027 | |
| 428 | 7028 CLASS_RESET_CHANGED_FLAGS (f); |
| 7029 f->window_face_cache_reset = 0; | |
| 7030 f->echo_area_garbaged = 0; | |
| 7031 f->clear = 0; | |
| 7032 | |
| 7033 if (!f->size_change_pending) | |
| 7034 f->size_changed = 0; | |
| 7035 | |
| 7036 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */ | |
| 7037 | |
| 853 | 7038 /* Allow frame size changes to occur again. */ |
| 7039 exit_redisplay_critical_section (depth); | |
| 428 | 7040 |
| 7041 return 0; | |
| 7042 } | |
| 7043 | |
| 440 | 7044 /* Ensure that all frames on the given device are correctly displayed. |
| 7045 If AUTOMATIC is non-zero, and the device implementation indicates | |
| 7046 no automatic redisplay, as printers do, then the device is not | |
| 7047 redisplayed. AUTOMATIC is set to zero when called from lisp | |
| 7048 functions (redraw-device) and (redisplay-device), and to non-zero | |
| 7049 when called from "lazy" redisplay(); | |
| 7050 */ | |
| 428 | 7051 |
| 7052 static int | |
| 440 | 7053 redisplay_device (struct device *d, int automatic) |
| 428 | 7054 { |
| 7055 Lisp_Object frame, frmcons; | |
| 7056 int size_change_failed = 0; | |
| 7057 struct frame *f; | |
| 7058 | |
| 545 | 7059 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY)) |
| 440 | 7060 return 0; |
| 7061 | |
| 428 | 7062 if (DEVICE_STREAM_P (d)) /* nothing to do */ |
| 7063 return 0; | |
| 7064 | |
| 7065 /* It is possible that redisplay has been called before the | |
| 545 | 7066 device is fully initialized, or that the console implementation |
| 7067 allows frameless devices. If so then continue with the next | |
| 7068 device. */ | |
| 428 | 7069 if (NILP (DEVICE_SELECTED_FRAME (d))) |
| 7070 return 0; | |
| 7071 | |
| 545 | 7072 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY)) |
| 7073 { | |
| 7074 int preempted; | |
| 7075 REDISPLAY_PREEMPTION_CHECK; | |
| 7076 if (preempted) | |
| 7077 return 1; | |
| 7078 } | |
| 428 | 7079 |
| 7080 /* Always do the selected frame first. */ | |
| 7081 frame = DEVICE_SELECTED_FRAME (d); | |
| 7082 | |
| 7083 f = XFRAME (frame); | |
| 7084 | |
| 7085 if (f->icon_changed || f->windows_changed) | |
| 7086 update_frame_icon (f); | |
| 7087 | |
| 7088 if (FRAME_REPAINT_P (f)) | |
| 7089 { | |
| 5198 | 7090 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f)) |
| 428 | 7091 { |
| 588 | 7092 int preempted = redisplay_frame (f, 1); |
| 545 | 7093 if (preempted) |
| 7094 return 1; | |
| 7095 } | |
| 428 | 7096 |
| 7097 /* If the frame redisplay did not get preempted, then this flag | |
| 4187 | 7098 should have gotten set to 0. It might be possible for that |
| 7099 not to happen if a size change event were to occur at an odd | |
| 7100 time. To make sure we don't miss anything we simply don't | |
| 7101 reset the top level flags until the condition ends up being | |
| 7102 in the right state. */ | |
| 428 | 7103 if (f->size_changed) |
| 7104 size_change_failed = 1; | |
| 7105 } | |
| 7106 | |
| 7107 DEVICE_FRAME_LOOP (frmcons, d) | |
| 7108 { | |
| 7109 f = XFRAME (XCAR (frmcons)); | |
| 7110 | |
| 7111 if (f == XFRAME (DEVICE_SELECTED_FRAME (d))) | |
| 7112 continue; | |
| 7113 | |
| 7114 if (f->icon_changed || f->windows_changed) | |
| 7115 update_frame_icon (f); | |
| 7116 | |
| 7117 if (FRAME_REPAINT_P (f)) | |
| 7118 { | |
| 430 | 7119 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f)) |
| 428 | 7120 { |
| 588 | 7121 int preempted = redisplay_frame (f, 1); |
| 545 | 7122 if (preempted) |
| 7123 return 1; | |
| 428 | 7124 } |
| 7125 | |
| 7126 if (f->size_change_pending) | |
| 7127 size_change_failed = 1; | |
| 7128 } | |
| 7129 } | |
| 7130 | |
| 7131 /* If we get here then we redisplayed all of our frames without | |
| 7132 getting preempted so mark ourselves as clean. */ | |
| 7133 CLASS_RESET_CHANGED_FLAGS (d); | |
| 7134 | |
| 7135 if (!size_change_failed) | |
| 7136 d->size_changed = 0; | |
| 7137 | |
| 7138 return 0; | |
| 7139 } | |
| 7140 | |
| 7141 /* Ensure that all windows on all frames on all devices are displaying | |
| 7142 the current contents of their respective buffers. */ | |
| 7143 | |
| 7144 static void | |
| 7145 redisplay_without_hooks (void) | |
| 7146 { | |
| 7147 Lisp_Object devcons, concons; | |
| 7148 int size_change_failed = 0; | |
| 1292 | 7149 PROFILE_DECLARE (); |
| 7150 | |
| 7151 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay); | |
| 428 | 7152 |
| 7153 if (asynch_device_change_pending) | |
| 7154 handle_asynch_device_change (); | |
| 7155 | |
| 7156 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP && | |
| 430 | 7157 !disable_preemption && preemption_count < max_preempts) |
| 428 | 7158 goto done; |
| 7159 | |
| 7160 DEVICE_LOOP_NO_BREAK (devcons, concons) | |
| 7161 { | |
| 7162 struct device *d = XDEVICE (XCAR (devcons)); | |
| 7163 int preempted; | |
| 7164 | |
| 430 | 7165 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d)) |
| 428 | 7166 { |
| 440 | 7167 preempted = redisplay_device (d, 1); |
| 428 | 7168 |
| 7169 if (preempted) | |
| 7170 { | |
| 7171 preemption_count++; | |
| 7172 RESET_CHANGED_SET_FLAGS; | |
| 7173 goto done; | |
| 7174 } | |
| 7175 | |
| 7176 /* See comment in redisplay_device. */ | |
| 7177 if (d->size_changed) | |
| 7178 size_change_failed = 1; | |
| 7179 } | |
| 7180 } | |
| 7181 preemption_count = 0; | |
| 7182 | |
| 7183 /* Mark redisplay as accurate */ | |
| 7184 GLOBAL_RESET_CHANGED_FLAGS; | |
| 7185 RESET_CHANGED_SET_FLAGS; | |
| 7186 | |
| 7187 if (faces_changed) | |
| 7188 { | |
| 7189 mark_all_faces_as_clean (); | |
| 7190 faces_changed = 0; | |
| 7191 } | |
| 7192 | |
| 7193 if (!size_change_failed) | |
| 7194 size_changed = 0; | |
| 7195 | |
| 7196 reset_buffer_changes (); | |
| 7197 | |
| 7198 done: | |
| 800 | 7199 #ifdef ERROR_CHECK_DISPLAY |
| 7200 sledgehammer_check_redisplay_structs (); | |
| 7201 #endif /* ERROR_CHECK_DISPLAY */ | |
| 1292 | 7202 |
| 7203 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay); | |
| 428 | 7204 } |
| 7205 | |
| 1318 | 7206 /* Note: All places in the C code that call redisplay() are prepared to |
| 7207 handle GCing, which can happen from run_pre_idle_hook(). However, we | |
| 7208 can't currently handle GC inside the guts of redisplay; see | |
| 7209 enter_redisplay_critical_section(). | |
| 853 | 7210 |
| 7211 (#### What about other external entry points to the redisplay code? | |
| 7212 Someone should go through and make sure that all callers can handle | |
| 7213 GC there, too.) | |
| 7214 */ | |
| 7215 | |
| 428 | 7216 void |
| 7217 redisplay (void) | |
| 7218 { | |
| 853 | 7219 run_pre_idle_hook (); |
| 7220 redisplay_no_pre_idle_hook (); | |
| 7221 } | |
| 7222 | |
| 7223 void | |
| 7224 redisplay_no_pre_idle_hook (void) | |
| 7225 { | |
| 428 | 7226 if (last_display_warning_tick != display_warning_tick && |
| 7227 !inhibit_warning_display) | |
| 7228 { | |
| 7229 /* If an error occurs during this function, oh well. | |
| 4187 | 7230 If we report another warning, we could get stuck in an |
| 428 | 7231 infinite loop reporting warnings. */ |
| 853 | 7232 call0_trapping_problems |
| 7233 (0, Qdisplay_warning_buffer, | |
| 7234 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION); | |
| 428 | 7235 last_display_warning_tick = display_warning_tick; |
| 7236 } | |
| 7237 | |
| 7238 redisplay_without_hooks (); | |
| 7239 } | |
| 7240 | |
| 853 | 7241 Lisp_Object |
| 7242 eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker) | |
| 7243 { | |
| 7244 return | |
| 7245 eval_in_buffer_trapping_problems | |
| 7246 ("Error calling function within redisplay", current_buffer, | |
| 1318 | 7247 dont_trust_this_damn_sucker, 0); |
| 853 | 7248 } |
| 428 | 7249 |
| 7250 /* Efficiently determine the window line number, and return a pointer | |
| 7251 to its printed representation. Do this regardless of whether | |
| 7252 line-number-mode is on. The first line in the buffer is counted as | |
| 7253 1. If narrowing is in effect, the lines are counted from the | |
| 7254 beginning of the visible portion of the buffer. */ | |
| 4970 | 7255 static Ascbyte * |
| 428 | 7256 window_line_number (struct window *w, int type) |
| 7257 { | |
| 7258 struct device *d = XDEVICE (XFRAME (w->frame)->device); | |
| 7259 struct buffer *b = XBUFFER (w->buffer); | |
| 7260 /* Be careful in the order of these tests. The first clause will | |
| 7261 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be). | |
| 7262 This can occur when the frame title is computed really early */ | |
| 665 | 7263 Charbpos pos = |
| 5198 | 7264 ((EQ (DEVICE_SELECTED_FRAME (d), w->frame) && |
| 7265 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d)))) && | |
| 7266 EQ (DEVICE_CONSOLE (d), Vselected_console) && | |
| 7267 XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d ) | |
| 428 | 7268 ? BUF_PT (b) |
| 7269 : marker_position (w->pointm[type])); | |
| 7270 EMACS_INT line; | |
| 7271 | |
| 7272 line = buffer_line_number (b, pos, 1); | |
| 7273 | |
| 603 | 7274 { |
| 4970 | 7275 static Ascbyte window_line_number_buf[DECIMAL_PRINT_SIZE (long)]; |
| 603 | 7276 |
| 7277 long_to_string (window_line_number_buf, line + 1); | |
| 7278 | |
| 7279 return window_line_number_buf; | |
| 7280 } | |
| 428 | 7281 } |
| 7282 | |
| 7283 | |
| 7284 /* Given a character representing an object in a modeline | |
| 7285 specification, return a string (stored into the global array | |
| 867 | 7286 `mode_spec_ibyte_string') with the information that object |
| 428 | 7287 represents. |
| 7288 | |
| 7289 This function is largely unchanged from previous versions of the | |
| 7290 redisplay engine. | |
| 7291 | |
| 7292 Warning! This code is also used for frame titles and can be called | |
| 7293 very early in the device/frame update process! JV | |
| 7294 */ | |
| 7295 | |
| 7296 static void | |
| 867 | 7297 decode_mode_spec (struct window *w, Ichar spec, int type) |
| 428 | 7298 { |
| 7299 Lisp_Object obj = Qnil; | |
| 4970 | 7300 const Ascbyte *str = NULL; |
| 428 | 7301 struct buffer *b = XBUFFER (w->buffer); |
| 7302 | |
| 867 | 7303 Dynarr_reset (mode_spec_ibyte_string); |
| 428 | 7304 |
| 7305 switch (spec) | |
| 7306 { | |
| 7307 /* print buffer name */ | |
| 7308 case 'b': | |
| 7309 obj = b->name; | |
| 7310 break; | |
| 7311 | |
| 7312 /* print visited file name */ | |
| 7313 case 'f': | |
| 7314 obj = b->filename; | |
| 7315 break; | |
| 7316 | |
| 7317 /* print the current column */ | |
| 7318 case 'c': | |
| 7319 { | |
| 4187 | 7320 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil))) |
| 7321 ? BUF_PT (b) | |
| 7322 : marker_position (w->pointm[type]); | |
| 428 | 7323 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one; |
| 4970 | 7324 Ascbyte buf[DECIMAL_PRINT_SIZE (long)]; |
| 428 | 7325 |
| 7326 long_to_string (buf, col); | |
| 7327 | |
| 867 | 7328 Dynarr_add_many (mode_spec_ibyte_string, |
| 7329 (const Ibyte *) buf, strlen (buf)); | |
| 428 | 7330 |
| 7331 goto decode_mode_spec_done; | |
| 7332 } | |
| 7333 /* print the file coding system */ | |
| 7334 case 'C': | |
| 7335 { | |
| 4187 | 7336 Lisp_Object codesys = b->buffer_file_coding_system; |
| 7337 /* Be very careful here not to get an error. */ | |
| 428 | 7338 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys)) |
| 4187 | 7339 { |
| 7340 codesys = find_coding_system_for_text_file (codesys, 0); | |
| 428 | 7341 if (CODING_SYSTEMP (codesys)) |
| 4187 | 7342 obj = XCODING_SYSTEM_MNEMONIC (codesys); |
| 7343 } | |
| 428 | 7344 } |
| 7345 break; | |
| 7346 | |
| 7347 /* print the current line number */ | |
| 7348 case 'l': | |
| 7349 str = window_line_number (w, type); | |
| 7350 break; | |
| 7351 | |
| 7352 /* print value of mode-name (obsolete) */ | |
| 7353 case 'm': | |
| 7354 obj = b->mode_name; | |
| 7355 break; | |
| 7356 | |
| 7357 /* print hyphen and frame number, if != 1 */ | |
| 7358 case 'N': | |
| 7359 #ifdef HAVE_TTY | |
| 7360 { | |
| 7361 struct frame *f = XFRAME (w->frame); | |
| 7362 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999) | |
| 7363 { | |
| 7364 /* Naughty, naughty */ | |
| 4970 | 7365 Ascbyte *writable_str = alloca_array (Ascbyte, 10); |
| 428 | 7366 sprintf (writable_str, "-%d", f->order_count); |
| 7367 str = writable_str; | |
| 7368 } | |
| 7369 } | |
| 7370 #endif /* HAVE_TTY */ | |
| 7371 break; | |
| 7372 | |
| 7373 /* print Narrow if appropriate */ | |
| 7374 case 'n': | |
| 7375 if (BUF_BEGV (b) > BUF_BEG (b) | |
| 7376 || BUF_ZV (b) < BUF_Z (b)) | |
| 7377 str = " Narrow"; | |
| 7378 break; | |
| 7379 | |
| 7380 /* print %, * or hyphen, if buffer is read-only, modified or neither */ | |
| 7381 case '*': | |
| 7382 str = (!NILP (b->read_only) | |
| 7383 ? "%" | |
| 7384 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) | |
| 7385 ? "*" | |
| 7386 : "-")); | |
| 7387 break; | |
| 7388 | |
| 7389 /* print * or hyphen -- XEmacs change to allow a buffer to be | |
| 4187 | 7390 read-only but still indicate whether it is modified. */ |
| 428 | 7391 case '+': |
| 7392 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) | |
| 7393 ? "*" | |
| 7394 : (!NILP (b->read_only) | |
| 7395 ? "%" | |
| 7396 : "-")); | |
| 7397 break; | |
| 7398 | |
| 7399 /* #### defined in 19.29 decode_mode_spec, but not in | |
| 4187 | 7400 modeline-format doc string. */ |
| 428 | 7401 /* This differs from %* in that it ignores read-only-ness. */ |
| 7402 case '&': | |
| 7403 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)) | |
| 7404 ? "*" | |
| 7405 : "-"); | |
| 7406 break; | |
| 7407 | |
| 7408 /* print process status */ | |
| 7409 case 's': | |
| 7410 obj = Fget_buffer_process (w->buffer); | |
| 7411 if (NILP (obj)) | |
| 7412 str = GETTEXT ("no process"); | |
| 7413 else | |
| 7414 obj = Fsymbol_name (Fprocess_status (obj)); | |
| 7415 break; | |
| 7416 | |
| 7417 /* Print name of selected frame. */ | |
| 7418 case 'S': | |
| 7419 obj = XFRAME (w->frame)->name; | |
| 7420 break; | |
| 7421 | |
| 7422 /* indicate TEXT or BINARY */ | |
| 7423 case 't': | |
| 7424 /* #### NT does not use this any more. Now what? */ | |
| 7425 str = "T"; | |
| 7426 break; | |
| 7427 | |
| 7428 /* print percent of buffer above top of window, or Top, Bot or All */ | |
| 7429 case 'p': | |
| 7430 { | |
| 665 | 7431 Charbpos pos = marker_position (w->start[type]); |
| 428 | 7432 |
| 7433 /* This had better be while the desired lines are being done. */ | |
| 7434 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b)) | |
| 7435 { | |
| 7436 if (pos <= BUF_BEGV (b)) | |
| 7437 str = "All"; | |
| 7438 else | |
| 7439 str = "Bottom"; | |
| 7440 } | |
| 7441 else if (pos <= BUF_BEGV (b)) | |
| 7442 str = "Top"; | |
| 7443 else | |
| 7444 { | |
| 7445 /* This hard limit is ok since the string it will hold has a | |
| 4187 | 7446 fixed maximum length of 3. But just to be safe... */ |
| 4970 | 7447 Ascbyte buf[10]; |
| 428 | 7448 Charcount chars = pos - BUF_BEGV (b); |
| 7449 Charcount total = BUF_ZV (b) - BUF_BEGV (b); | |
| 7450 | |
| 7451 /* Avoid overflow on big buffers */ | |
| 7452 int percent = total > LONG_MAX/200 ? | |
| 7453 (chars + total/200) / (total / 100) : | |
| 7454 (chars * 100 + total/2) / total; | |
| 7455 | |
| 7456 /* We can't normally display a 3-digit number, so get us a | |
| 4187 | 7457 2-digit number that is close. */ |
| 428 | 7458 if (percent == 100) |
| 7459 percent = 99; | |
| 7460 | |
| 7461 sprintf (buf, "%d%%", percent); | |
| 867 | 7462 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf, |
| 428 | 7463 strlen (buf)); |
| 7464 | |
| 7465 goto decode_mode_spec_done; | |
| 7466 } | |
| 7467 break; | |
| 7468 } | |
| 7469 | |
| 7470 /* print percent of buffer above bottom of window, perhaps plus | |
| 7471 Top, or print Bottom or All */ | |
| 7472 case 'P': | |
| 7473 { | |
| 665 | 7474 Charbpos toppos = marker_position (w->start[type]); |
| 7475 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type]; | |
| 428 | 7476 |
| 7477 /* botpos is only accurate as of the last redisplay, so we can | |
| 4187 | 7478 only treat it as a hint. In particular, after erase-buffer, |
| 7479 botpos may be negative. */ | |
| 428 | 7480 if (botpos < toppos) |
| 7481 botpos = toppos; | |
| 7482 | |
| 7483 if (botpos >= BUF_ZV (b)) | |
| 7484 { | |
| 7485 if (toppos <= BUF_BEGV (b)) | |
| 7486 str = "All"; | |
| 7487 else | |
| 7488 str = "Bottom"; | |
| 7489 } | |
| 7490 else | |
| 7491 { | |
| 7492 /* This hard limit is ok since the string it will hold has a | |
| 4187 | 7493 fixed maximum length of around 6. But just to be safe... */ |
| 4970 | 7494 Ascbyte buf[10]; |
| 428 | 7495 Charcount chars = botpos - BUF_BEGV (b); |
| 7496 Charcount total = BUF_ZV (b) - BUF_BEGV (b); | |
| 7497 | |
| 7498 /* Avoid overflow on big buffers */ | |
| 7499 int percent = total > LONG_MAX/200 ? | |
| 7500 (chars + total/200) / (total / 100) : | |
| 7501 (chars * 100 + total/2) / max (total, 1); | |
| 7502 | |
| 7503 /* We can't normally display a 3-digit number, so get us a | |
| 4187 | 7504 2-digit number that is close. */ |
| 428 | 7505 if (percent == 100) |
| 7506 percent = 99; | |
| 7507 | |
| 7508 if (toppos <= BUF_BEGV (b)) | |
| 7509 sprintf (buf, "Top%d%%", percent); | |
| 7510 else | |
| 7511 sprintf (buf, "%d%%", percent); | |
| 7512 | |
| 867 | 7513 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf, |
| 428 | 7514 strlen (buf)); |
| 7515 | |
| 7516 goto decode_mode_spec_done; | |
| 7517 } | |
| 7518 break; | |
| 7519 } | |
| 7520 | |
| 7521 /* print % */ | |
| 7522 case '%': | |
| 7523 str = "%"; | |
| 7524 break; | |
| 7525 | |
| 7526 /* print one [ for each recursive editing level. */ | |
| 7527 case '[': | |
| 7528 { | |
| 7529 int i; | |
| 7530 | |
| 7531 if (command_loop_level > 5) | |
| 7532 { | |
| 7533 str = "[[[... "; | |
| 7534 break; | |
| 7535 } | |
| 7536 | |
| 7537 for (i = 0; i < command_loop_level; i++) | |
| 867 | 7538 Dynarr_add (mode_spec_ibyte_string, '['); |
| 428 | 7539 |
| 7540 goto decode_mode_spec_done; | |
| 7541 } | |
| 7542 | |
| 7543 /* print one ] for each recursive editing level. */ | |
| 7544 case ']': | |
| 7545 { | |
| 7546 int i; | |
| 7547 | |
| 7548 if (command_loop_level > 5) | |
| 7549 { | |
| 7550 str = "...]]]"; | |
| 7551 break; | |
| 7552 } | |
| 7553 | |
| 7554 for (i = 0; i < command_loop_level; i++) | |
| 867 | 7555 Dynarr_add (mode_spec_ibyte_string, ']'); |
| 428 | 7556 |
| 7557 goto decode_mode_spec_done; | |
| 7558 } | |
| 7559 | |
| 7560 /* print infinitely many dashes -- handle at top level now */ | |
| 7561 case '-': | |
| 7562 break; | |
| 7563 | |
| 7564 } | |
| 7565 | |
| 7566 if (STRINGP (obj)) | |
| 867 | 7567 Dynarr_add_many (mode_spec_ibyte_string, |
| 428 | 7568 XSTRING_DATA (obj), |
| 7569 XSTRING_LENGTH (obj)); | |
| 7570 else if (str) | |
| 867 | 7571 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str)); |
| 428 | 7572 |
| 7573 decode_mode_spec_done: | |
| 867 | 7574 Dynarr_add (mode_spec_ibyte_string, '\0'); |
| 428 | 7575 } |
| 7576 | |
| 7577 /* Given a display line, free all of its data structures. */ | |
| 7578 | |
| 7579 static void | |
| 7580 free_display_line (struct display_line *dl) | |
| 7581 { | |
| 7582 int block; | |
| 7583 | |
| 7584 if (dl->display_blocks) | |
| 7585 { | |
| 7586 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++) | |
| 4187 | 7587 { |
| 428 | 7588 struct display_block *db = Dynarr_atp (dl->display_blocks, block); |
| 7589 | |
| 7590 Dynarr_free (db->runes); | |
| 7591 } | |
| 7592 | |
| 7593 Dynarr_free (dl->display_blocks); | |
| 7594 dl->display_blocks = NULL; | |
| 7595 } | |
| 7596 | |
| 7597 if (dl->left_glyphs) | |
| 7598 { | |
| 7599 Dynarr_free (dl->left_glyphs); | |
| 7600 dl->left_glyphs = NULL; | |
| 7601 } | |
| 7602 | |
| 7603 if (dl->right_glyphs) | |
| 7604 { | |
| 7605 Dynarr_free (dl->right_glyphs); | |
| 7606 dl->right_glyphs = NULL; | |
| 7607 } | |
| 7608 } | |
| 7609 | |
| 7610 | |
| 7611 /* Given an array of display lines, free them and all data structures | |
| 7612 contained within them. */ | |
| 7613 | |
| 7614 void | |
| 7615 free_display_lines (display_line_dynarr *dla) | |
| 7616 { | |
| 7617 int line; | |
| 7618 | |
| 7619 for (line = 0; line < Dynarr_largest (dla); line++) | |
| 7620 { | |
| 7621 free_display_line (Dynarr_atp (dla, line)); | |
| 7622 } | |
| 7623 | |
| 7624 Dynarr_free (dla); | |
| 7625 } | |
| 7626 | |
| 7627 /* Call internal free routine for each set of display lines. */ | |
| 7628 | |
| 7629 void | |
| 7630 free_display_structs (struct window_mirror *mir) | |
| 7631 { | |
| 7632 if (mir->current_display_lines) | |
| 7633 { | |
| 7634 free_display_lines (mir->current_display_lines); | |
| 7635 mir->current_display_lines = 0; | |
| 7636 } | |
| 7637 | |
| 7638 if (mir->desired_display_lines) | |
| 7639 { | |
| 7640 free_display_lines (mir->desired_display_lines); | |
| 7641 mir->desired_display_lines = 0; | |
| 7642 } | |
| 7643 } | |
| 7644 | |
| 7645 | |
| 7646 static void | |
| 7647 mark_glyph_block_dynarr (glyph_block_dynarr *gba) | |
| 7648 { | |
| 7649 if (gba) | |
| 7650 { | |
| 4967 | 7651 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
|
7652 glyph_block *gb_last = Dynarr_past_lastp (gba); |
| 428 | 7653 |
| 7654 for (; gb < gb_last; gb++) | |
| 7655 { | |
| 7656 if (!NILP (gb->glyph)) | |
| 7657 mark_object (gb->glyph); | |
| 7658 if (!NILP (gb->extent)) | |
| 7659 mark_object (gb->extent); | |
| 7660 } | |
| 7661 } | |
| 7662 } | |
| 7663 | |
| 442 | 7664 /* See the comment in image_instantiate_cache_result as to why marking |
| 7665 the glyph will also mark the image_instance. */ | |
| 7666 void | |
| 428 | 7667 mark_redisplay_structs (display_line_dynarr *dla) |
| 7668 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7669 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
|
7670 display_line *dl_last = Dynarr_past_lastp (dla); |
| 428 | 7671 |
| 7672 for (; dl < dl_last; dl++) | |
| 7673 { | |
| 7674 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
|
7675 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
|
7676 display_block *db_last = Dynarr_past_lastp (dba); |
| 428 | 7677 |
| 7678 for (; db < db_last; db++) | |
| 7679 { | |
| 7680 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
|
7681 rune *r = Dynarr_begin (ra); |
|
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7682 rune *r_last = Dynarr_past_lastp (ra); |
| 428 | 7683 |
| 7684 for (; r < r_last; r++) | |
| 7685 { | |
| 7686 if (r->type == RUNE_DGLYPH) | |
| 7687 { | |
| 7688 if (!NILP (r->object.dglyph.glyph)) | |
| 7689 mark_object (r->object.dglyph.glyph); | |
| 7690 if (!NILP (r->object.dglyph.extent)) | |
| 7691 mark_object (r->object.dglyph.extent); | |
| 7692 } | |
| 7693 } | |
| 7694 } | |
| 7695 | |
| 7696 mark_glyph_block_dynarr (dl->left_glyphs); | |
| 7697 mark_glyph_block_dynarr (dl->right_glyphs); | |
| 7698 } | |
| 7699 } | |
| 7700 | |
| 7701 | |
| 2367 | 7702 |
| 7703 /* | |
| 7704 | |
| 7705 Info on line-start cache: | |
| 7706 | |
| 7707 (Info-goto-node "(internals)Line Start Cache") | |
| 7708 */ | |
| 428 | 7709 |
| 7710 /* This will get used quite a bit so we don't want to be constantly | |
| 7711 allocating and freeing it. */ | |
| 7712 static line_start_cache_dynarr *internal_cache; | |
| 7713 | |
| 7714 /* Makes internal_cache represent the TYPE display structs and only | |
| 7715 the TYPE display structs. */ | |
| 7716 | |
| 7717 static void | |
| 7718 update_internal_cache_list (struct window *w, int type) | |
| 7719 { | |
| 7720 int line; | |
| 7721 display_line_dynarr *dla = window_display_lines (w, type); | |
| 7722 | |
| 7723 Dynarr_reset (internal_cache); | |
| 7724 for (line = 0; line < Dynarr_length (dla); line++) | |
| 7725 { | |
| 7726 struct display_line *dl = Dynarr_atp (dla, line); | |
| 7727 | |
| 7728 if (dl->modeline) | |
| 7729 continue; | |
| 7730 else | |
| 7731 { | |
| 7732 struct line_start_cache lsc; | |
| 434 | 7733 |
| 826 | 7734 lsc.start = dl->charpos; |
| 7735 lsc.end = dl->end_charpos; | |
| 428 | 7736 lsc.height = dl->ascent + dl->descent; |
| 7737 | |
| 7738 Dynarr_add (internal_cache, lsc); | |
| 7739 } | |
| 7740 } | |
| 7741 } | |
| 7742 | |
| 7743 /* Reset the line cache if necessary. This should be run at the | |
| 7744 beginning of any function which access the cache. */ | |
| 7745 | |
| 7746 static void | |
| 7747 validate_line_start_cache (struct window *w) | |
| 7748 { | |
| 7749 struct buffer *b = XBUFFER (w->buffer); | |
| 7750 struct frame *f = XFRAME (w->frame); | |
| 7751 | |
| 7752 if (!w->line_cache_validation_override) | |
| 7753 { | |
| 7754 /* f->extents_changed used to be in here because extent face and | |
| 4187 | 7755 size changes can cause text shifting. However, the extent |
| 7756 covering the region is constantly having its face set and | |
| 7757 priority altered by the mouse code. This means that the line | |
| 7758 start cache is constantly being invalidated. This is bad | |
| 7759 since the mouse code also triggers heavy usage of the cache. | |
| 7760 Since it is an unlikely that f->extents being changed | |
| 7761 indicates that the cache really needs to be updated and if it | |
| 7762 does redisplay will catch it pretty quickly we no longer | |
| 7763 invalidate the cache if it is set. This greatly speeds up | |
| 7764 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
|
7765 if (XFIXNUM (w->line_cache_last_updated) < BUF_MODIFF (b) |
| 428 | 7766 || f->faces_changed |
| 7767 || f->clip_changed) | |
| 7768 { | |
| 7769 Dynarr_reset (w->line_start_cache); | |
| 7770 } | |
| 7771 } | |
| 7772 } | |
| 7773 | |
| 7774 /* Return the very first buffer position contained in the given | |
| 7775 window's cache, or -1 if the cache is empty. Assumes that the | |
| 7776 cache is valid. */ | |
| 7777 | |
| 665 | 7778 static Charbpos |
| 428 | 7779 line_start_cache_start (struct window *w) |
| 7780 { | |
| 7781 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 7782 | |
| 7783 if (!Dynarr_length (cache)) | |
| 7784 return -1; | |
| 7785 else | |
| 4967 | 7786 return Dynarr_begin (cache)->start; |
| 428 | 7787 } |
| 7788 | |
| 7789 /* Return the very last buffer position contained in the given | |
| 7790 window's cache, or -1 if the cache is empty. Assumes that the | |
| 7791 cache is valid. */ | |
| 7792 | |
| 665 | 7793 static Charbpos |
| 428 | 7794 line_start_cache_end (struct window *w) |
| 7795 { | |
| 7796 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 7797 | |
| 7798 if (!Dynarr_length (cache)) | |
| 7799 return -1; | |
| 7800 else | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
7801 return Dynarr_lastp (cache)->end; |
| 428 | 7802 } |
| 7803 | |
| 7804 /* Return the index of the line POINT is contained within in window | |
| 7805 W's line start cache. It will enlarge the cache or move the cache | |
| 7806 window in order to have POINT be present in the cache. MIN_PAST is | |
| 7807 a guarantee of the number of entries in the cache present on either | |
| 7808 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1 | |
| 7809 then it will be treated as 0, but the cache window will not be | |
| 7810 allowed to shift. Returns -1 if POINT cannot be found in the cache | |
| 7811 for any reason. */ | |
| 7812 | |
| 7813 int | |
| 665 | 7814 point_in_line_start_cache (struct window *w, Charbpos point, int min_past) |
| 428 | 7815 { |
| 7816 struct buffer *b = XBUFFER (w->buffer); | |
| 7817 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 647 | 7818 int top, bottom, pos; |
| 428 | 7819 |
| 7820 validate_line_start_cache (w); | |
| 7821 w->line_cache_validation_override++; | |
| 7822 | |
| 7823 /* Let functions pass in negative values, but we still treat -1 | |
| 7824 specially. */ | |
| 7825 /* #### bogosity alert */ | |
| 7826 if (min_past < 0 && min_past != -1) | |
| 7827 min_past = -min_past; | |
| 7828 | |
| 7829 if (!Dynarr_length (cache) || line_start_cache_start (w) > point | |
| 7830 || line_start_cache_end (w) < point) | |
| 7831 { | |
| 7832 int loop; | |
| 7833 int win_char_height = window_char_height (w, 1); | |
| 7834 | |
| 7835 /* Occasionally we get here with a 0 height | |
| 4187 | 7836 window. find_next_newline_no_quit will abort if we pass it a |
| 7837 count of 0 so handle that case. */ | |
| 428 | 7838 if (!win_char_height) |
| 7839 win_char_height = 1; | |
| 7840 | |
| 7841 if (!Dynarr_length (cache)) | |
| 7842 { | |
| 665 | 7843 Charbpos from = find_next_newline_no_quit (b, point, -1); |
| 7844 Charbpos to = find_next_newline_no_quit (b, from, win_char_height); | |
| 428 | 7845 |
| 7846 update_line_start_cache (w, from, to, point, 0); | |
| 7847 | |
| 7848 if (!Dynarr_length (cache)) | |
| 7849 { | |
| 7850 w->line_cache_validation_override--; | |
| 7851 return -1; | |
| 7852 } | |
| 7853 } | |
| 7854 | |
| 7855 assert (Dynarr_length (cache)); | |
| 7856 | |
| 7857 loop = 0; | |
| 7858 while (line_start_cache_start (w) > point | |
| 7859 && (loop < cache_adjustment || min_past == -1)) | |
| 7860 { | |
| 665 | 7861 Charbpos from, to; |
| 428 | 7862 |
| 7863 from = line_start_cache_start (w); | |
| 7864 if (from <= BUF_BEGV (b)) | |
| 7865 break; | |
| 7866 | |
| 7867 from = find_next_newline_no_quit (b, from, -win_char_height); | |
| 7868 to = line_start_cache_end (w); | |
| 7869 | |
| 7870 update_line_start_cache (w, from, to, point, 0); | |
| 7871 loop++; | |
| 7872 } | |
| 7873 | |
| 7874 if (line_start_cache_start (w) > point) | |
| 7875 { | |
| 665 | 7876 Charbpos from, to; |
| 428 | 7877 |
| 7878 from = find_next_newline_no_quit (b, point, -1); | |
| 7879 if (from >= BUF_ZV (b)) | |
| 7880 { | |
| 7881 to = find_next_newline_no_quit (b, from, -win_char_height); | |
| 7882 from = to; | |
| 7883 to = BUF_ZV (b); | |
| 7884 } | |
| 7885 else | |
| 7886 to = find_next_newline_no_quit (b, from, win_char_height); | |
| 7887 | |
| 7888 update_line_start_cache (w, from, to, point, 0); | |
| 7889 } | |
| 7890 | |
| 7891 loop = 0; | |
| 7892 while (line_start_cache_end (w) < point | |
| 7893 && (loop < cache_adjustment || min_past == -1)) | |
| 7894 { | |
| 665 | 7895 Charbpos from, to; |
| 428 | 7896 |
| 7897 to = line_start_cache_end (w); | |
| 7898 if (to >= BUF_ZV (b)) | |
| 7899 break; | |
| 7900 | |
| 7901 from = line_start_cache_end (w); | |
| 7902 to = find_next_newline_no_quit (b, from, win_char_height); | |
| 7903 | |
| 7904 update_line_start_cache (w, from, to, point, 0); | |
| 7905 loop++; | |
| 7906 } | |
| 7907 | |
| 7908 if (line_start_cache_end (w) < point) | |
| 7909 { | |
| 665 | 7910 Charbpos from, to; |
| 428 | 7911 |
| 7912 from = find_next_newline_no_quit (b, point, -1); | |
| 7913 if (from >= BUF_ZV (b)) | |
| 7914 { | |
| 7915 to = find_next_newline_no_quit (b, from, -win_char_height); | |
| 7916 from = to; | |
| 7917 to = BUF_ZV (b); | |
| 7918 } | |
| 7919 else | |
| 7920 to = find_next_newline_no_quit (b, from, win_char_height); | |
| 7921 | |
| 7922 update_line_start_cache (w, from, to, point, 0); | |
| 7923 } | |
| 7924 } | |
| 7925 | |
| 7926 assert (Dynarr_length (cache)); | |
| 7927 | |
| 7928 if (min_past == -1) | |
| 7929 min_past = 0; | |
| 7930 | |
| 7931 /* This could happen if the buffer is narrowed. */ | |
| 7932 if (line_start_cache_start (w) > point | |
| 7933 || line_start_cache_end (w) < point) | |
| 7934 { | |
| 7935 w->line_cache_validation_override--; | |
| 7936 return -1; | |
| 7937 } | |
| 7938 | |
| 7939 find_point_loop: | |
| 7940 | |
| 7941 top = Dynarr_length (cache) - 1; | |
| 7942 bottom = 0; | |
| 7943 | |
| 7944 while (1) | |
| 7945 { | |
| 647 | 7946 int new_pos; |
| 665 | 7947 Charbpos start, end; |
| 428 | 7948 |
| 7949 pos = (bottom + top + 1) >> 1; | |
| 7950 start = Dynarr_atp (cache, pos)->start; | |
| 7951 end = Dynarr_atp (cache, pos)->end; | |
| 7952 | |
| 7953 if (point >= start && point <= end) | |
| 7954 { | |
| 7955 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b)) | |
| 7956 { | |
| 665 | 7957 Charbpos from = |
| 428 | 7958 find_next_newline_no_quit (b, line_start_cache_start (w), |
| 7959 -min_past - 1); | |
| 665 | 7960 Charbpos to = line_start_cache_end (w); |
| 428 | 7961 |
| 7962 update_line_start_cache (w, from, to, point, 0); | |
| 7963 goto find_point_loop; | |
| 7964 } | |
| 7965 else if ((Dynarr_length (cache) - pos - 1) < min_past | |
| 7966 && line_start_cache_end (w) < BUF_ZV (b)) | |
| 7967 { | |
| 665 | 7968 Charbpos from = line_start_cache_end (w); |
| 7969 Charbpos to = find_next_newline_no_quit (b, from, | |
| 428 | 7970 (min_past |
| 7971 ? min_past | |
| 7972 : 1)); | |
| 7973 | |
| 7974 update_line_start_cache (w, from, to, point, 0); | |
| 7975 goto find_point_loop; | |
| 7976 } | |
| 7977 else | |
| 7978 { | |
| 7979 w->line_cache_validation_override--; | |
| 7980 return pos; | |
| 7981 } | |
| 7982 } | |
| 7983 else if (point > end) | |
| 7984 bottom = pos + 1; | |
| 7985 else if (point < start) | |
| 7986 top = pos - 1; | |
| 7987 else | |
| 2500 | 7988 ABORT (); |
| 428 | 7989 |
| 7990 new_pos = (bottom + top + 1) >> 1; | |
| 7991 if (pos == new_pos) | |
| 7992 { | |
| 7993 w->line_cache_validation_override--; | |
| 7994 return -1; | |
| 7995 } | |
| 7996 } | |
| 7997 } | |
| 7998 | |
| 7999 /* Return a boolean indicating if POINT would be visible in window W | |
| 1708 | 8000 if display of the window was to begin at STARTP. If PARTIALLY is |
| 8001 zero, then if POINT has fewer visible pixels than the window clip, | |
| 8002 0 is returned; otherwise, 1 is returned if POINT has any visible | |
| 8003 pixels. */ | |
| 428 | 8004 int |
| 1708 | 8005 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point, |
| 8006 int partially) | |
| 428 | 8007 { |
| 8008 struct buffer *b = XBUFFER (w->buffer); | |
| 5198 | 8009 int pixpos = -WINDOW_TEXT_TOP_CLIP (w); |
| 428 | 8010 int bottom = WINDOW_TEXT_HEIGHT (w); |
| 8011 int start_elt; | |
| 8012 | |
| 8013 /* If point is before the intended start it obviously can't be visible. */ | |
| 8014 if (point < startp) | |
| 8015 return 0; | |
| 8016 | |
| 8017 /* If point or start are not in the accessible buffer range, then | |
| 8018 fail. */ | |
| 8019 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b) | |
| 8020 || point < BUF_BEGV (b) || point > BUF_ZV (b)) | |
| 8021 return 0; | |
| 8022 | |
| 8023 validate_line_start_cache (w); | |
| 8024 w->line_cache_validation_override++; | |
| 8025 | |
| 8026 start_elt = point_in_line_start_cache (w, startp, 0); | |
| 8027 if (start_elt == -1) | |
| 8028 { | |
| 8029 w->line_cache_validation_override--; | |
| 8030 return 0; | |
| 8031 } | |
| 8032 | |
| 8033 assert (line_start_cache_start (w) <= startp | |
| 8034 && line_start_cache_end (w) >= startp); | |
| 8035 | |
| 8036 while (1) | |
| 8037 { | |
| 8038 int height; | |
| 8039 | |
| 8040 /* Expand the cache if necessary. */ | |
| 8041 if (start_elt == Dynarr_length (w->line_start_cache)) | |
| 8042 { | |
| 665 | 8043 Charbpos old_startp = |
| 428 | 8044 Dynarr_atp (w->line_start_cache, start_elt - 1)->start; |
| 8045 | |
| 8046 start_elt = point_in_line_start_cache (w, old_startp, | |
| 8047 window_char_height (w, 0)); | |
| 8048 | |
| 8049 /* We've already actually processed old_startp, so increment | |
| 4187 | 8050 immediately. */ |
| 428 | 8051 start_elt++; |
| 8052 | |
| 8053 /* If this happens we didn't add any extra elements. Bummer. */ | |
| 8054 if (start_elt == Dynarr_length (w->line_start_cache)) | |
| 8055 { | |
| 8056 w->line_cache_validation_override--; | |
| 8057 return 0; | |
| 8058 } | |
| 8059 } | |
| 8060 | |
| 8061 height = Dynarr_atp (w->line_start_cache, start_elt)->height; | |
| 8062 | |
| 8063 if (pixpos + height > bottom) | |
| 8064 { | |
| 1708 | 8065 if (bottom - pixpos < (partially ? 0 : VERTICAL_CLIP (w, 0))) |
| 428 | 8066 { |
| 8067 w->line_cache_validation_override--; | |
| 8068 return 0; | |
| 8069 } | |
| 8070 } | |
| 8071 | |
| 8072 pixpos += height; | |
| 8073 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end) | |
| 8074 { | |
| 8075 w->line_cache_validation_override--; | |
| 8076 return 1; | |
| 8077 } | |
| 8078 | |
| 8079 start_elt++; | |
| 8080 } | |
| 8081 } | |
| 8082 | |
| 8083 /* For the given window W, if display starts at STARTP, what will be | |
| 8084 the buffer position at the beginning or end of the last line | |
| 8085 displayed. The end of the last line is also know as the window end | |
| 8086 position. | |
| 8087 | |
| 442 | 8088 WARNING: It is possible that redisplay failed to layout any lines for the |
| 8089 windows. Under normal circumstances this is rare. However it seems that it | |
| 8090 does occur in the following situation: A mouse event has come in and we | |
| 8091 need to compute its location in a window. That code (in | |
| 8092 pixel_to_glyph_translation) already can handle 0 as an error return value. | |
| 8093 | |
| 428 | 8094 #### With a little work this could probably be reworked as just a |
| 8095 call to start_with_line_at_pixpos. */ | |
| 8096 | |
| 665 | 8097 static Charbpos |
| 8098 start_end_of_last_line (struct window *w, Charbpos startp, int end, | |
| 4187 | 8099 int may_error) |
| 428 | 8100 { |
| 8101 struct buffer *b = XBUFFER (w->buffer); | |
| 8102 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 8103 int pixpos = 0; | |
| 8104 int bottom = WINDOW_TEXT_HEIGHT (w); | |
| 665 | 8105 Charbpos cur_start; |
| 428 | 8106 int start_elt; |
| 8107 | |
| 8108 validate_line_start_cache (w); | |
| 8109 w->line_cache_validation_override++; | |
| 8110 | |
| 8111 if (startp < BUF_BEGV (b)) | |
| 8112 startp = BUF_BEGV (b); | |
| 8113 else if (startp > BUF_ZV (b)) | |
| 8114 startp = BUF_ZV (b); | |
| 8115 cur_start = startp; | |
| 8116 | |
| 8117 start_elt = point_in_line_start_cache (w, cur_start, 0); | |
| 8118 if (start_elt == -1) | |
| 442 | 8119 return may_error ? 0 : startp; |
| 428 | 8120 |
| 8121 while (1) | |
| 8122 { | |
| 8123 int height = Dynarr_atp (cache, start_elt)->height; | |
| 8124 | |
| 8125 cur_start = Dynarr_atp (cache, start_elt)->start; | |
| 8126 | |
| 8127 if (pixpos + height > bottom) | |
| 8128 { | |
| 8129 /* Adjust for any possible clip. */ | |
| 8130 if (bottom - pixpos < VERTICAL_CLIP (w, 0)) | |
| 8131 start_elt--; | |
| 8132 | |
| 8133 if (start_elt < 0) | |
| 8134 { | |
| 8135 w->line_cache_validation_override--; | |
| 8136 if (end) | |
| 8137 return BUF_ZV (b); | |
| 8138 else | |
| 8139 return BUF_BEGV (b); | |
| 8140 } | |
| 8141 else | |
| 8142 { | |
| 8143 w->line_cache_validation_override--; | |
| 8144 if (end) | |
| 8145 return Dynarr_atp (cache, start_elt)->end; | |
| 8146 else | |
| 8147 return Dynarr_atp (cache, start_elt)->start; | |
| 8148 } | |
| 8149 } | |
| 8150 | |
| 8151 pixpos += height; | |
| 8152 start_elt++; | |
| 8153 if (start_elt == Dynarr_length (cache)) | |
| 8154 { | |
| 665 | 8155 Charbpos from = line_start_cache_end (w); |
| 428 | 8156 int win_char_height = window_char_height (w, 0); |
| 665 | 8157 Charbpos to = find_next_newline_no_quit (b, from, |
| 428 | 8158 (win_char_height |
| 8159 ? win_char_height | |
| 8160 : 1)); | |
| 8161 | |
| 8162 /* We've hit the end of the bottom so that's what it is. */ | |
| 8163 if (from >= BUF_ZV (b)) | |
| 8164 { | |
| 8165 w->line_cache_validation_override--; | |
| 8166 return BUF_ZV (b); | |
| 8167 } | |
| 8168 | |
| 8169 update_line_start_cache (w, from, to, BUF_PT (b), 0); | |
| 8170 | |
| 8171 /* Updating the cache invalidates any current indexes. */ | |
| 8172 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1; | |
| 8173 } | |
| 8174 } | |
| 8175 } | |
| 8176 | |
| 8177 /* For the given window W, if display starts at STARTP, what will be | |
| 8178 the buffer position at the beginning of the last line displayed. */ | |
| 8179 | |
| 665 | 8180 Charbpos |
| 8181 start_of_last_line (struct window *w, Charbpos startp) | |
| 428 | 8182 { |
| 442 | 8183 return start_end_of_last_line (w, startp, 0 , 0); |
| 428 | 8184 } |
| 8185 | |
| 8186 /* For the given window W, if display starts at STARTP, what will be | |
| 8187 the buffer position at the end of the last line displayed. This is | |
| 8188 also know as the window end position. */ | |
| 8189 | |
| 665 | 8190 Charbpos |
| 8191 end_of_last_line (struct window *w, Charbpos startp) | |
| 428 | 8192 { |
| 442 | 8193 return start_end_of_last_line (w, startp, 1, 0); |
| 428 | 8194 } |
| 8195 | |
| 665 | 8196 static Charbpos |
| 8197 end_of_last_line_may_error (struct window *w, Charbpos startp) | |
| 442 | 8198 { |
| 8199 return start_end_of_last_line (w, startp, 1, 1); | |
| 8200 } | |
| 8201 | |
| 8202 | |
| 428 | 8203 /* For window W, what does the starting position have to be so that |
| 8204 the line containing POINT will cover pixel position PIXPOS. */ | |
| 8205 | |
| 665 | 8206 Charbpos |
| 8207 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos) | |
| 428 | 8208 { |
| 8209 struct buffer *b = XBUFFER (w->buffer); | |
| 8210 int cur_elt; | |
| 665 | 8211 Charbpos cur_pos, prev_pos = point; |
| 428 | 8212 int point_line_height; |
| 8213 int pixheight = pixpos - WINDOW_TEXT_TOP (w); | |
| 8214 | |
| 8215 validate_line_start_cache (w); | |
| 8216 w->line_cache_validation_override++; | |
| 8217 | |
| 8218 cur_elt = point_in_line_start_cache (w, point, 0); | |
| 8219 /* #### See comment in update_line_start_cache about big minibuffers. */ | |
| 8220 if (cur_elt < 0) | |
| 8221 { | |
| 8222 w->line_cache_validation_override--; | |
| 8223 return point; | |
| 8224 } | |
| 8225 | |
| 8226 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height; | |
| 8227 | |
| 8228 while (1) | |
| 8229 { | |
| 8230 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start; | |
| 8231 | |
| 8232 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height; | |
| 8233 | |
| 8234 /* Do not take into account the value of vertical_clip here. | |
| 4187 | 8235 That is the responsibility of the calling functions. */ |
| 428 | 8236 if (pixheight < 0) |
| 8237 { | |
| 8238 w->line_cache_validation_override--; | |
| 8239 if (-pixheight > point_line_height) | |
| 8240 /* We can't make the target line cover pixpos, so put it | |
| 8241 above pixpos. That way it will at least be visible. */ | |
| 8242 return prev_pos; | |
| 8243 else | |
| 8244 return cur_pos; | |
| 8245 } | |
| 8246 | |
| 8247 cur_elt--; | |
| 8248 while (cur_elt < 0) | |
| 8249 { | |
| 665 | 8250 Charbpos from, to; |
| 428 | 8251 int win_char_height; |
| 8252 | |
| 8253 if (cur_pos <= BUF_BEGV (b)) | |
| 8254 { | |
| 8255 w->line_cache_validation_override--; | |
| 8256 return BUF_BEGV (b); | |
| 8257 } | |
| 8258 | |
| 8259 win_char_height = window_char_height (w, 0); | |
| 8260 if (!win_char_height) | |
| 8261 win_char_height = 1; | |
| 8262 | |
| 8263 from = find_next_newline_no_quit (b, cur_pos, -win_char_height); | |
| 8264 to = line_start_cache_end (w); | |
| 8265 update_line_start_cache (w, from, to, point, 0); | |
| 8266 | |
| 8267 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1; | |
| 8268 assert (cur_elt >= -1); | |
| 8269 /* This used to be cur_elt>=0 under the assumption that if | |
| 8270 point is in the top line and not at BUF_BEGV, then | |
| 434 | 8271 setting the window_start to a newline before the start of |
| 428 | 8272 the first line will always cause scrolling. |
| 8273 | |
| 8274 However in my (jv) opinion this is wrong. That new line | |
| 8275 can be hidden in various ways: invisible extents, an | |
| 8276 explicit window-start not at a newline character etc. | |
| 8277 The existence of those are indeed known to create crashes | |
| 8278 on that assert. So we have no option but to continue the | |
| 8279 search if we found point at the top of the line_start_cache | |
| 8280 again. */ | |
| 4967 | 8281 cur_pos = Dynarr_begin (w->line_start_cache)->start; |
| 428 | 8282 } |
| 8283 prev_pos = cur_pos; | |
| 8284 } | |
| 8285 } | |
| 8286 | |
| 8287 /* For window W, what does the starting position have to be so that | |
| 8288 the line containing point is on display line LINE. If LINE is | |
| 8289 positive it is considered to be the number of lines from the top of | |
| 8290 the window (0 is the top line). If it is negative the number is | |
| 8291 considered to be the number of lines from the bottom (-1 is the | |
| 8292 bottom line). */ | |
| 8293 | |
| 665 | 8294 Charbpos |
| 8295 start_with_point_on_display_line (struct window *w, Charbpos point, int line) | |
| 428 | 8296 { |
| 8297 validate_line_start_cache (w); | |
| 8298 w->line_cache_validation_override++; | |
| 8299 | |
| 8300 if (line >= 0) | |
| 8301 { | |
| 8302 int cur_elt = point_in_line_start_cache (w, point, line); | |
| 8303 | |
| 8304 if (cur_elt - line < 0) | |
| 8305 cur_elt = 0; /* Hit the top */ | |
| 8306 else | |
| 8307 cur_elt -= line; | |
| 8308 | |
| 8309 w->line_cache_validation_override--; | |
| 8310 return Dynarr_atp (w->line_start_cache, cur_elt)->start; | |
| 8311 } | |
| 8312 else | |
| 8313 { | |
| 8314 /* The calculated value of pixpos is correct for the bottom line | |
| 4187 | 8315 or what we want when line is -1. Therefore we subtract one |
| 8316 because we have already handled one line. */ | |
| 428 | 8317 int new_line = -line - 1; |
| 8318 int cur_elt = point_in_line_start_cache (w, point, new_line); | |
| 8319 int pixpos = WINDOW_TEXT_BOTTOM (w); | |
| 665 | 8320 Charbpos retval, search_point; |
| 428 | 8321 |
| 8322 /* If scroll_on_clipped_lines is false, the last "visible" line of | |
| 4187 | 8323 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1. |
| 8324 If s_o_c_l is true, then we don't want to count a clipped | |
| 8325 line, so back up from the bottom by the height of the line | |
| 8326 containing point. */ | |
| 428 | 8327 if (scroll_on_clipped_lines) |
| 8328 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height; | |
| 8329 else | |
| 8330 pixpos -= 1; | |
| 8331 | |
| 8332 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache)) | |
| 8333 { | |
| 8334 /* Hit the bottom of the buffer. */ | |
| 8335 int adjustment = | |
| 8336 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1; | |
| 8337 Lisp_Object window; | |
| 8338 int defheight; | |
| 8339 | |
| 793 | 8340 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
|
8341 default_face_width_and_height (window, 0, &defheight); |
| 428 | 8342 |
| 8343 cur_elt = Dynarr_length (w->line_start_cache) - 1; | |
| 8344 | |
| 8345 pixpos -= (adjustment * defheight); | |
| 8346 if (pixpos < WINDOW_TEXT_TOP (w)) | |
| 8347 pixpos = WINDOW_TEXT_TOP (w); | |
| 8348 } | |
| 8349 else | |
| 8350 cur_elt = cur_elt + new_line; | |
| 8351 | |
| 8352 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start; | |
| 8353 | |
| 8354 retval = start_with_line_at_pixpos (w, search_point, pixpos); | |
| 8355 w->line_cache_validation_override--; | |
| 8356 return retval; | |
| 8357 } | |
| 8358 } | |
| 8359 | |
| 8360 /* This is used to speed up vertical scrolling by caching the known | |
| 8361 buffer starting positions for display lines. This allows the | |
| 8362 scrolling routines to avoid costly calls to regenerate_window. If | |
| 8363 NO_REGEN is true then it will only add the values in the DESIRED | |
| 8364 display structs which are in the given range. | |
| 8365 | |
| 8366 Note also that the FROM/TO values are minimums. It is possible | |
| 8367 that this function will actually add information outside of the | |
| 8368 lines containing those positions. This can't hurt but it could | |
| 8369 possibly help. | |
| 8370 | |
| 8371 #### We currently force the cache to have only 1 contiguous region. | |
| 8372 It might help to make the cache a dynarr of caches so that we can | |
| 8373 cover more areas. This might, however, turn out to be a lot of | |
| 8374 overhead for too little gain. */ | |
| 8375 | |
| 8376 static void | |
| 665 | 8377 update_line_start_cache (struct window *w, Charbpos from, Charbpos to, |
| 8378 Charbpos point, int no_regen) | |
| 428 | 8379 { |
| 8380 struct buffer *b = XBUFFER (w->buffer); | |
| 8381 line_start_cache_dynarr *cache = w->line_start_cache; | |
| 665 | 8382 Charbpos low_bound, high_bound; |
| 428 | 8383 |
| 8384 validate_line_start_cache (w); | |
| 8385 w->line_cache_validation_override++; | |
| 8386 | |
| 8387 if (from < BUF_BEGV (b)) | |
| 8388 from = BUF_BEGV (b); | |
| 8389 if (to > BUF_ZV (b)) | |
| 8390 to = BUF_ZV (b); | |
| 8391 | |
| 8392 if (from > to) | |
| 8393 { | |
| 8394 w->line_cache_validation_override--; | |
| 8395 return; | |
| 8396 } | |
| 8397 | |
| 8398 if (Dynarr_length (cache)) | |
| 8399 { | |
| 8400 low_bound = line_start_cache_start (w); | |
| 8401 high_bound = line_start_cache_end (w); | |
| 8402 | |
| 8403 /* Check to see if the desired range is already in the cache. */ | |
| 8404 if (from >= low_bound && to <= high_bound) | |
| 8405 { | |
| 8406 w->line_cache_validation_override--; | |
| 8407 return; | |
| 8408 } | |
| 8409 | |
| 8410 /* Check to make sure that the desired range is adjacent to the | |
| 8411 current cache. If not, invalidate the cache. */ | |
| 8412 if (to < low_bound || from > high_bound) | |
| 8413 { | |
| 8414 Dynarr_reset (cache); | |
| 8415 low_bound = high_bound = -1; | |
| 8416 } | |
| 8417 } | |
| 8418 else | |
| 8419 { | |
| 8420 low_bound = high_bound = -1; | |
| 8421 } | |
| 8422 | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5486
diff
changeset
|
8423 w->line_cache_last_updated = make_fixnum (BUF_MODIFF (b)); |
| 428 | 8424 |
| 8425 /* This could be integrated into the next two sections, but it is easier | |
| 8426 to follow what's going on by having it separate. */ | |
| 8427 if (no_regen) | |
| 8428 { | |
| 665 | 8429 Charbpos start, end; |
| 428 | 8430 |
| 8431 update_internal_cache_list (w, DESIRED_DISP); | |
| 8432 if (!Dynarr_length (internal_cache)) | |
| 8433 { | |
| 8434 w->line_cache_validation_override--; | |
| 8435 return; | |
| 8436 } | |
| 8437 | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8438 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
|
8439 end = Dynarr_lastp (internal_cache)->end; |
| 428 | 8440 |
| 8441 /* We aren't allowed to generate additional information to fill in | |
| 4187 | 8442 gaps, so if the DESIRED structs don't overlap the cache, reset the |
| 8443 cache. */ | |
| 428 | 8444 if (Dynarr_length (cache)) |
| 8445 { | |
| 8446 if (end < low_bound || start > high_bound) | |
| 8447 Dynarr_reset (cache); | |
| 8448 | |
| 8449 /* #### What should really happen if what we are doing is | |
| 4187 | 8450 extending a line (the last line)? */ |
| 428 | 8451 if (Dynarr_length (cache) == 1 |
| 8452 && Dynarr_length (internal_cache) == 1) | |
| 8453 Dynarr_reset (cache); | |
| 8454 } | |
| 8455 | |
| 8456 if (!Dynarr_length (cache)) | |
| 8457 { | |
| 4967 | 8458 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8459 Dynarr_length (internal_cache)); |
| 8460 w->line_cache_validation_override--; | |
| 8461 return; | |
| 8462 } | |
| 8463 | |
| 8464 /* An extra check just in case the calling function didn't pass in | |
| 4187 | 8465 the bounds of the DESIRED structs in the first place. */ |
| 428 | 8466 if (start >= low_bound && end <= high_bound) |
| 8467 { | |
| 8468 w->line_cache_validation_override--; | |
| 8469 return; | |
| 8470 } | |
| 8471 | |
| 8472 /* At this point we know that the internal cache partially overlaps | |
| 4187 | 8473 the main cache. */ |
| 428 | 8474 if (start < low_bound) |
| 8475 { | |
| 8476 int ic_elt = Dynarr_length (internal_cache) - 1; | |
| 8477 while (ic_elt >= 0) | |
| 8478 { | |
| 8479 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound) | |
| 8480 break; | |
| 8481 else | |
| 8482 ic_elt--; | |
| 8483 } | |
| 8484 | |
| 8485 if (!(ic_elt >= 0)) | |
| 8486 { | |
| 8487 Dynarr_reset (cache); | |
| 4967 | 8488 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8489 Dynarr_length (internal_cache)); |
| 8490 w->line_cache_validation_override--; | |
| 8491 return; | |
| 8492 } | |
| 8493 | |
| 5038 | 8494 Dynarr_prepend_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8495 ic_elt + 1); |
| 8496 } | |
| 8497 | |
| 8498 if (end > high_bound) | |
| 8499 { | |
| 8500 int ic_elt = 0; | |
| 8501 | |
| 8502 while (ic_elt < Dynarr_length (internal_cache)) | |
| 8503 { | |
| 8504 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound) | |
| 8505 break; | |
| 8506 else | |
| 8507 ic_elt++; | |
| 8508 } | |
| 8509 | |
| 8510 if (!(ic_elt < Dynarr_length (internal_cache))) | |
| 8511 { | |
| 8512 Dynarr_reset (cache); | |
| 4967 | 8513 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8514 Dynarr_length (internal_cache)); |
| 8515 w->line_cache_validation_override--; | |
| 8516 return; | |
| 8517 } | |
| 8518 | |
| 8519 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt), | |
| 8520 Dynarr_length (internal_cache) - ic_elt); | |
| 8521 } | |
| 8522 | |
| 8523 w->line_cache_validation_override--; | |
| 8524 return; | |
| 8525 } | |
| 8526 | |
| 8527 if (!Dynarr_length (cache) || from < low_bound) | |
| 8528 { | |
| 665 | 8529 Charbpos startp = find_next_newline_no_quit (b, from, -1); |
| 428 | 8530 int marker = 0; |
| 8531 int old_lb = low_bound; | |
| 8532 | |
| 8533 while (startp < old_lb || low_bound == -1) | |
| 8534 { | |
| 8535 int ic_elt; | |
| 4187 | 8536 Charbpos new_startp; |
| 428 | 8537 |
| 8538 regenerate_window (w, startp, point, CMOTION_DISP); | |
| 8539 update_internal_cache_list (w, CMOTION_DISP); | |
| 8540 | |
| 8541 /* If this assert is triggered then regenerate_window failed | |
| 4187 | 8542 to layout a single line. This is not possible since we |
| 442 | 8543 force at least a single line to be layout for CMOTION_DISP */ |
| 8544 assert (Dynarr_length (internal_cache)); | |
| 4967 | 8545 assert (startp == Dynarr_begin (internal_cache)->start); |
| 428 | 8546 |
| 8547 ic_elt = Dynarr_length (internal_cache) - 1; | |
| 8548 if (low_bound != -1) | |
| 8549 { | |
| 8550 while (ic_elt >= 0) | |
| 8551 { | |
| 8552 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb) | |
| 8553 break; | |
| 8554 else | |
| 8555 ic_elt--; | |
| 8556 } | |
| 8557 } | |
| 8558 assert (ic_elt >= 0); | |
| 8559 | |
| 8560 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1; | |
| 8561 | |
| 4187 | 8562 /* |
| 8563 * Handle invisible text properly: | |
| 8564 * If the last line we're inserting has the same end as the | |
| 8565 * line before which it will be added, merge the two lines. | |
| 8566 */ | |
| 8567 if (Dynarr_length (cache) && | |
| 8568 Dynarr_atp (internal_cache, ic_elt)->end == | |
| 8569 Dynarr_atp (cache, marker)->end) | |
| 8570 { | |
| 8571 Dynarr_atp (cache, marker)->start | |
| 8572 = Dynarr_atp (internal_cache, ic_elt)->start; | |
| 8573 Dynarr_atp (cache, marker)->height | |
| 8574 = Dynarr_atp (internal_cache, ic_elt)->height; | |
| 8575 ic_elt--; | |
| 8576 } | |
| 8577 | |
| 8578 if (ic_elt >= 0) /* we still have lines to add.. */ | |
| 8579 { | |
| 4967 | 8580 Dynarr_insert_many (cache, Dynarr_begin (internal_cache), |
| 4187 | 8581 ic_elt + 1, marker); |
| 8582 marker += (ic_elt + 1); | |
| 8583 } | |
| 428 | 8584 |
| 8585 if (startp < low_bound || low_bound == -1) | |
| 8586 low_bound = startp; | |
| 8587 startp = new_startp; | |
| 8588 if (startp > BUF_ZV (b)) | |
| 8589 { | |
| 8590 w->line_cache_validation_override--; | |
| 8591 return; | |
| 8592 } | |
| 8593 } | |
| 8594 } | |
| 8595 | |
| 8596 assert (Dynarr_length (cache)); | |
| 8597 assert (from >= low_bound); | |
| 8598 | |
| 8599 /* Readjust the high_bound to account for any changes made while | |
| 8600 correcting the low_bound. */ | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8601 high_bound = Dynarr_lastp (cache)->end; |
| 428 | 8602 |
| 8603 if (to > high_bound) | |
| 8604 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8605 Charbpos startp = Dynarr_lastp (cache)->end + 1; |
| 428 | 8606 |
| 8607 do | |
| 8608 { | |
| 8609 regenerate_window (w, startp, point, CMOTION_DISP); | |
| 8610 update_internal_cache_list (w, CMOTION_DISP); | |
| 8611 | |
| 8612 /* See comment above about regenerate_window failing. */ | |
| 8613 assert (Dynarr_length (internal_cache)); | |
| 8614 | |
| 4967 | 8615 Dynarr_add_many (cache, Dynarr_begin (internal_cache), |
| 428 | 8616 Dynarr_length (internal_cache)); |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8617 high_bound = Dynarr_lastp (cache)->end; |
| 428 | 8618 startp = high_bound + 1; |
| 8619 } | |
| 8620 while (to > high_bound); | |
| 8621 } | |
| 8622 | |
| 8623 w->line_cache_validation_override--; | |
| 8624 assert (to <= high_bound); | |
| 8625 } | |
| 8626 | |
| 8627 | |
| 8628 /* Given x and y coordinates in characters, relative to a window, | |
| 8629 return the pixel location corresponding to those coordinates. The | |
| 8630 pixel location returned is the center of the given character | |
| 8631 position. The pixel values are generated relative to the window, | |
| 8632 not the frame. | |
| 8633 | |
| 8634 The modeline is considered to be part of the window. */ | |
| 8635 | |
| 8636 void | |
| 8637 glyph_to_pixel_translation (struct window *w, int char_x, int char_y, | |
| 8638 int *pix_x, int *pix_y) | |
| 8639 { | |
| 8640 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP); | |
| 8641 int num_disp_lines, modeline; | |
| 8642 Lisp_Object window; | |
| 8643 int defheight, defwidth; | |
| 8644 | |
| 793 | 8645 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
|
8646 default_face_width_and_height (window, &defwidth, &defheight); |
| 428 | 8647 |
| 8648 /* If we get a bogus value indicating somewhere above or to the left of | |
| 8649 the window, use the first window line or character position | |
| 8650 instead. */ | |
| 8651 if (char_y < 0) | |
| 8652 char_y = 0; | |
| 8653 if (char_x < 0) | |
| 8654 char_x = 0; | |
| 8655 | |
| 8656 num_disp_lines = Dynarr_length (dla); | |
| 8657 modeline = 0; | |
| 8658 if (num_disp_lines) | |
| 8659 { | |
| 4967 | 8660 if (Dynarr_begin (dla)->modeline) |
| 428 | 8661 { |
| 8662 num_disp_lines--; | |
| 8663 modeline = 1; | |
| 8664 } | |
| 8665 } | |
| 8666 | |
| 8667 /* First check if the y position intersects the display lines. */ | |
| 8668 if (char_y < num_disp_lines) | |
| 8669 { | |
| 8670 struct display_line *dl = Dynarr_atp (dla, char_y + modeline); | |
| 8671 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 8672 | |
| 8673 *pix_y = (dl->ypos - dl->ascent + | |
| 647 | 8674 ((dl->ascent + dl->descent - dl->clip) >> 1)); |
| 428 | 8675 |
| 8676 if (char_x < Dynarr_length (db->runes)) | |
| 8677 { | |
| 8678 struct rune *rb = Dynarr_atp (db->runes, char_x); | |
| 8679 | |
| 8680 *pix_x = rb->xpos + (rb->width >> 1); | |
| 8681 } | |
| 8682 else | |
| 8683 { | |
| 8684 int last_rune = Dynarr_length (db->runes) - 1; | |
| 8685 struct rune *rb = Dynarr_atp (db->runes, last_rune); | |
| 8686 | |
| 8687 char_x -= last_rune; | |
| 8688 | |
| 8689 *pix_x = rb->xpos + rb->width; | |
| 8690 *pix_x += ((char_x - 1) * defwidth); | |
| 8691 *pix_x += (defwidth >> 1); | |
| 8692 } | |
| 8693 } | |
| 8694 else | |
| 8695 { | |
| 8696 /* It didn't intersect, so extrapolate. #### For now, we include the | |
| 8697 modeline in this since we don't have true character positions in | |
| 8698 it. */ | |
| 8699 | |
| 8700 if (!Dynarr_length (w->face_cachels)) | |
| 8701 reset_face_cachels (w); | |
| 8702 | |
| 8703 char_y -= num_disp_lines; | |
| 8704 | |
| 8705 if (Dynarr_length (dla)) | |
| 8706 { | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
8707 struct display_line *dl = Dynarr_lastp (dla); |
| 428 | 8708 *pix_y = dl->ypos + dl->descent - dl->clip; |
| 8709 } | |
| 8710 else | |
| 8711 *pix_y = WINDOW_TEXT_TOP (w); | |
| 8712 | |
| 8713 *pix_y += (char_y * defheight); | |
| 8714 *pix_y += (defheight >> 1); | |
| 8715 | |
| 8716 *pix_x = WINDOW_TEXT_LEFT (w); | |
| 8717 /* Don't adjust by one because this is still the unadjusted value. */ | |
| 8718 *pix_x += (char_x * defwidth); | |
| 8719 *pix_x += (defwidth >> 1); | |
| 8720 } | |
| 8721 | |
| 8722 if (*pix_x > w->pixel_left + w->pixel_width) | |
| 8723 *pix_x = w->pixel_left + w->pixel_width; | |
| 8724 if (*pix_y > w->pixel_top + w->pixel_height) | |
| 8725 *pix_y = w->pixel_top + w->pixel_height; | |
| 8726 | |
| 8727 *pix_x -= w->pixel_left; | |
| 8728 *pix_y -= w->pixel_top; | |
| 8729 } | |
| 8730 | |
| 8731 /* Given a display line and a position, determine if there is a glyph | |
| 8732 there and return information about it if there is. */ | |
| 8733 | |
| 8734 static void | |
| 8735 get_position_object (struct display_line *dl, Lisp_Object *obj1, | |
| 8736 Lisp_Object *obj2, int x_coord, int *low_x_coord, | |
| 8737 int *high_x_coord) | |
| 8738 { | |
| 8739 struct display_block *db; | |
| 8740 int elt; | |
| 8741 int block = | |
| 8742 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0); | |
| 8743 | |
| 8744 /* We use get_next_display_block to get the actual display block | |
| 8745 that would be displayed at x_coord. */ | |
| 8746 | |
| 8747 if (block == NO_BLOCK) | |
| 8748 return; | |
| 8749 else | |
| 8750 db = Dynarr_atp (dl->display_blocks, block); | |
| 8751 | |
| 8752 for (elt = 0; elt < Dynarr_length (db->runes); elt++) | |
| 8753 { | |
| 8754 struct rune *rb = Dynarr_atp (db->runes, elt); | |
| 8755 | |
| 8756 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width)) | |
| 8757 { | |
| 8758 if (rb->type == RUNE_DGLYPH) | |
| 8759 { | |
| 8760 *obj1 = rb->object.dglyph.glyph; | |
| 8761 *obj2 = rb->object.dglyph.extent; | |
| 8762 } | |
| 8763 else | |
| 8764 { | |
| 8765 *obj1 = Qnil; | |
| 8766 *obj2 = Qnil; | |
| 8767 } | |
| 8768 | |
| 8769 if (low_x_coord) | |
| 8770 *low_x_coord = rb->xpos; | |
| 8771 if (high_x_coord) | |
| 8772 *high_x_coord = rb->xpos + rb->width; | |
| 8773 | |
| 8774 return; | |
| 8775 } | |
| 8776 } | |
| 8777 } | |
| 8778 | |
| 8779 #define UPDATE_CACHE_RETURN \ | |
| 8780 do { \ | |
| 8781 d->pixel_to_glyph_cache.valid = 1; \ | |
| 8782 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \ | |
| 8783 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \ | |
| 8784 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \ | |
| 8785 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \ | |
| 8786 d->pixel_to_glyph_cache.frame = f; \ | |
| 8787 d->pixel_to_glyph_cache.col = *col; \ | |
| 8788 d->pixel_to_glyph_cache.row = *row; \ | |
| 8789 d->pixel_to_glyph_cache.obj_x = *obj_x; \ | |
| 8790 d->pixel_to_glyph_cache.obj_y = *obj_y; \ | |
| 8791 d->pixel_to_glyph_cache.w = *w; \ | |
| 5090 | 8792 d->pixel_to_glyph_cache.charpos = *charpos; \ |
| 428 | 8793 d->pixel_to_glyph_cache.closest = *closest; \ |
| 8794 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \ | |
| 8795 d->pixel_to_glyph_cache.obj1 = *obj1; \ | |
| 8796 d->pixel_to_glyph_cache.obj2 = *obj2; \ | |
| 8797 d->pixel_to_glyph_cache.retval = position; \ | |
| 8798 RETURN_SANS_WARNINGS position; \ | |
| 8799 } while (0) | |
| 8800 | |
| 8801 /* Given x and y coordinates in pixels relative to a frame, return | |
| 8802 information about what is located under those coordinates. | |
| 8803 | |
| 8804 The return value will be one of: | |
| 8805 | |
| 8806 OVER_TOOLBAR: over one of the 4 frame toolbars | |
| 8807 OVER_MODELINE: over a modeline | |
| 8808 OVER_BORDER: over an internal border | |
| 5090 | 8809 OVER_V_DIVIDER: over a vertical divider between windows (used as a |
| 8810 grab bar for resizing) | |
| 428 | 8811 OVER_NOTHING: over the text area, but not over text |
| 8812 OVER_OUTSIDE: outside of the frame border | |
| 8813 OVER_TEXT: over text in the text area | |
| 8814 | |
| 5090 | 8815 #### GEOM! We need to also have an OVER_GUTTER, OVER_SCROLLBAR and |
| 8816 OVER_DEAD_BOX. | |
| 8817 | |
| 428 | 8818 OBJ1 is one of |
| 8819 | |
| 8820 -- a toolbar button | |
| 8821 -- a glyph | |
| 8822 -- nil if the coordinates are not over a glyph or a toolbar button. | |
| 8823 | |
| 8824 OBJ2 is one of | |
| 8825 | |
| 8826 -- an extent, if the coordinates are over a glyph in the text area | |
| 8827 -- nil otherwise. | |
| 8828 | |
| 8829 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the | |
| 8830 equivalent coordinates relative to the upper-left corner of the glyph. | |
| 8831 | |
| 8832 If the coordinates are over a character, OBJ_X and OBJ_Y give the | |
| 8833 equivalent coordinates relative to the upper-left corner of the character. | |
| 8834 | |
| 8835 Otherwise, OBJ_X and OBJ_Y are undefined. | |
| 8836 */ | |
| 8837 | |
| 8838 int | |
| 8839 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord, | |
| 8840 int *col, int *row, int *obj_x, int *obj_y, | |
| 826 | 8841 struct window **w, Charbpos *charpos, |
| 665 | 8842 Charbpos *closest, Charcount *modeline_closest, |
| 428 | 8843 Lisp_Object *obj1, Lisp_Object *obj2) |
| 8844 { | |
| 8845 struct device *d; | |
| 8846 struct pixel_to_glyph_translation_cache *cache; | |
| 8847 Lisp_Object window; | |
| 8848 int frm_left, frm_right, frm_top, frm_bottom; | |
| 8849 int low_x_coord, high_x_coord, low_y_coord, high_y_coord; | |
| 8850 int position = OVER_NOTHING; | |
| 8851 int device_check_failed = 0; | |
| 8852 display_line_dynarr *dla; | |
| 8853 | |
| 8854 /* This is a safety valve in case this got called with a frame in | |
| 8855 the middle of being deleted. */ | |
| 8856 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device))) | |
| 8857 { | |
| 8858 device_check_failed = 1; | |
| 8859 d = NULL, cache = NULL; /* Warning suppression */ | |
| 8860 } | |
| 8861 else | |
| 8862 { | |
| 8863 d = XDEVICE (f->device); | |
| 8864 cache = &d->pixel_to_glyph_cache; | |
| 8865 } | |
| 8866 | |
| 8867 if (!device_check_failed | |
| 8868 && cache->valid | |
| 8869 && cache->frame == f | |
| 8870 && cache->low_x_coord <= x_coord | |
| 8871 && cache->high_x_coord > x_coord | |
| 8872 && cache->low_y_coord <= y_coord | |
| 8873 && cache->high_y_coord > y_coord) | |
| 8874 { | |
| 8875 *col = cache->col; | |
| 8876 *row = cache->row; | |
| 8877 *obj_x = cache->obj_x; | |
| 8878 *obj_y = cache->obj_y; | |
| 8879 *w = cache->w; | |
| 826 | 8880 *charpos = cache->charpos; |
| 428 | 8881 *closest = cache->closest; |
| 8882 *modeline_closest = cache->modeline_closest; | |
| 8883 *obj1 = cache->obj1; | |
| 8884 *obj2 = cache->obj2; | |
| 8885 | |
| 8886 return cache->retval; | |
| 8887 } | |
| 8888 else | |
| 8889 { | |
| 8890 *col = 0; | |
| 8891 *row = 0; | |
| 8892 *obj_x = 0; | |
| 8893 *obj_y = 0; | |
| 8894 *w = 0; | |
| 826 | 8895 *charpos = 0; |
| 428 | 8896 *closest = 0; |
| 8897 *modeline_closest = -1; | |
| 8898 *obj1 = Qnil; | |
| 8899 *obj2 = Qnil; | |
| 8900 | |
| 8901 low_x_coord = x_coord; | |
| 8902 high_x_coord = x_coord + 1; | |
| 8903 low_y_coord = y_coord; | |
| 8904 high_y_coord = y_coord + 1; | |
| 8905 } | |
| 8906 | |
| 8907 if (device_check_failed) | |
| 8908 return OVER_NOTHING; | |
| 8909 | |
| 5090 | 8910 /* #### GEOM! The gutter is just inside of this. We should also have an |
| 8911 OVER_GUTTER return value to indicate that we're over a gutter. See | |
| 8912 above. */ | |
| 8913 frm_left = FRAME_LEFT_INTERNAL_BORDER_END (f); | |
| 8914 frm_right = FRAME_RIGHT_INTERNAL_BORDER_START (f); | |
| 8915 frm_top = FRAME_TOP_INTERNAL_BORDER_END (f); | |
| 8916 frm_bottom = FRAME_BOTTOM_INTERNAL_BORDER_START (f); | |
| 428 | 8917 |
| 8918 /* Check if the mouse is outside of the text area actually used by | |
| 8919 redisplay. */ | |
| 8920 if (y_coord < frm_top) | |
| 8921 { | |
| 5090 | 8922 if (y_coord >= FRAME_TOP_INTERNAL_BORDER_START (f)) |
| 8923 { | |
| 8924 low_y_coord = FRAME_TOP_INTERNAL_BORDER_START (f); | |
| 428 | 8925 high_y_coord = frm_top; |
| 8926 position = OVER_BORDER; | |
| 8927 } | |
| 8928 else if (y_coord >= 0) | |
| 8929 { | |
| 8930 low_y_coord = 0; | |
| 5090 | 8931 high_y_coord = FRAME_TOP_INTERNAL_BORDER_START (f); |
| 428 | 8932 position = OVER_TOOLBAR; |
| 8933 } | |
| 8934 else | |
| 8935 { | |
| 8936 low_y_coord = y_coord; | |
| 8937 high_y_coord = 0; | |
| 8938 position = OVER_OUTSIDE; | |
| 8939 } | |
| 8940 } | |
| 8941 else if (y_coord >= frm_bottom) | |
| 8942 { | |
| 5090 | 8943 if (y_coord < FRAME_BOTTOM_INTERNAL_BORDER_END (f)) |
| 428 | 8944 { |
| 8945 low_y_coord = frm_bottom; | |
| 5090 | 8946 high_y_coord = FRAME_BOTTOM_INTERNAL_BORDER_END (f); |
| 428 | 8947 position = OVER_BORDER; |
| 8948 } | |
| 8949 else if (y_coord < FRAME_PIXHEIGHT (f)) | |
| 8950 { | |
| 5090 | 8951 low_y_coord = FRAME_BOTTOM_INTERNAL_BORDER_END (f); |
| 428 | 8952 high_y_coord = FRAME_PIXHEIGHT (f); |
| 8953 position = OVER_TOOLBAR; | |
| 8954 } | |
| 8955 else | |
| 8956 { | |
| 8957 low_y_coord = FRAME_PIXHEIGHT (f); | |
| 8958 high_y_coord = y_coord; | |
| 8959 position = OVER_OUTSIDE; | |
| 8960 } | |
| 8961 } | |
| 8962 | |
| 8963 if (position != OVER_TOOLBAR && position != OVER_BORDER) | |
| 8964 { | |
| 8965 if (x_coord < frm_left) | |
| 8966 { | |
| 5090 | 8967 if (x_coord >= FRAME_LEFT_INTERNAL_BORDER_START (f)) |
| 8968 { | |
| 8969 low_x_coord = FRAME_LEFT_INTERNAL_BORDER_START (f); | |
| 428 | 8970 high_x_coord = frm_left; |
| 8971 position = OVER_BORDER; | |
| 8972 } | |
| 8973 else if (x_coord >= 0) | |
| 8974 { | |
| 8975 low_x_coord = 0; | |
| 5090 | 8976 high_x_coord = FRAME_LEFT_INTERNAL_BORDER_START (f); |
| 428 | 8977 position = OVER_TOOLBAR; |
| 8978 } | |
| 8979 else | |
| 8980 { | |
| 8981 low_x_coord = x_coord; | |
| 8982 high_x_coord = 0; | |
| 8983 position = OVER_OUTSIDE; | |
| 8984 } | |
| 8985 } | |
| 8986 else if (x_coord >= frm_right) | |
| 8987 { | |
| 5090 | 8988 if (x_coord < FRAME_RIGHT_INTERNAL_BORDER_END (f)) |
| 428 | 8989 { |
| 8990 low_x_coord = frm_right; | |
| 5090 | 8991 high_x_coord = FRAME_RIGHT_INTERNAL_BORDER_END (f); |
| 428 | 8992 position = OVER_BORDER; |
| 8993 } | |
| 8994 else if (x_coord < FRAME_PIXWIDTH (f)) | |
| 8995 { | |
| 5090 | 8996 low_x_coord = FRAME_RIGHT_INTERNAL_BORDER_END (f); |
| 428 | 8997 high_x_coord = FRAME_PIXWIDTH (f); |
| 8998 position = OVER_TOOLBAR; | |
| 8999 } | |
| 9000 else | |
| 9001 { | |
| 9002 low_x_coord = FRAME_PIXWIDTH (f); | |
| 9003 high_x_coord = x_coord; | |
| 9004 position = OVER_OUTSIDE; | |
| 9005 } | |
| 9006 } | |
| 9007 } | |
| 9008 | |
| 9009 #ifdef HAVE_TOOLBARS | |
| 9010 if (position == OVER_TOOLBAR) | |
| 9011 { | |
| 9012 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord); | |
| 9013 *obj2 = Qnil; | |
| 9014 *w = 0; | |
| 9015 UPDATE_CACHE_RETURN; | |
| 9016 } | |
| 9017 #endif /* HAVE_TOOLBARS */ | |
| 9018 | |
| 9019 /* We still have to return the window the pointer is next to and its | |
| 9020 relative y position even if it is outside the x boundary. */ | |
| 9021 if (x_coord < frm_left) | |
| 9022 x_coord = frm_left; | |
| 9023 else if (x_coord > frm_right) | |
| 9024 x_coord = frm_right; | |
| 9025 | |
| 9026 /* Same in reverse. */ | |
| 9027 if (y_coord < frm_top) | |
| 9028 y_coord = frm_top; | |
| 9029 else if (y_coord > frm_bottom) | |
| 9030 y_coord = frm_bottom; | |
| 9031 | |
| 9032 /* Find what window the given coordinates are actually in. */ | |
| 9033 window = f->root_window; | |
| 9034 *w = find_window_by_pixel_pos (x_coord, y_coord, window); | |
| 9035 | |
| 9036 /* If we didn't find a window, we're done. */ | |
| 9037 if (!*w) | |
| 9038 { | |
| 9039 UPDATE_CACHE_RETURN; | |
| 9040 } | |
| 9041 else if (position != OVER_NOTHING) | |
| 9042 { | |
| 9043 *closest = 0; | |
| 9044 *modeline_closest = -1; | |
| 9045 | |
| 9046 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom) | |
| 9047 { | |
| 9048 *w = 0; | |
| 9049 UPDATE_CACHE_RETURN; | |
| 9050 } | |
| 9051 } | |
| 9052 | |
| 9053 /* Check if the window is a minibuffer but isn't active. */ | |
| 9054 if (MINI_WINDOW_P (*w) && !minibuf_level) | |
| 9055 { | |
| 9056 /* Must reset the window value since some callers will ignore | |
| 4187 | 9057 the return value if it is set. */ |
| 428 | 9058 *w = 0; |
| 9059 UPDATE_CACHE_RETURN; | |
| 9060 } | |
| 9061 | |
| 9062 /* See if the point is over window vertical divider */ | |
| 9063 if (window_needs_vertical_divider (*w)) | |
| 9064 { | |
| 9065 int div_x_high = WINDOW_RIGHT (*w); | |
| 9066 int div_x_low = div_x_high - window_divider_width (*w); | |
| 9067 int div_y_high = WINDOW_BOTTOM (*w); | |
| 9068 int div_y_low = WINDOW_TOP (*w); | |
| 9069 | |
| 9070 if (div_x_low < x_coord && x_coord <= div_x_high && | |
| 9071 div_y_low < y_coord && y_coord <= div_y_high) | |
| 9072 { | |
| 9073 low_x_coord = div_x_low; | |
| 9074 high_x_coord = div_x_high; | |
| 9075 low_y_coord = div_y_low; | |
| 9076 high_y_coord = div_y_high; | |
| 9077 position = OVER_V_DIVIDER; | |
| 9078 UPDATE_CACHE_RETURN; | |
| 9079 } | |
| 9080 } | |
| 9081 | |
| 9082 dla = window_display_lines (*w, CURRENT_DISP); | |
| 9083 | |
| 9084 for (*row = 0; *row < Dynarr_length (dla); (*row)++) | |
| 9085 { | |
| 9086 int really_over_nothing = 0; | |
| 9087 struct display_line *dl = Dynarr_atp (dla, *row); | |
| 9088 | |
| 9089 if ((int) (dl->ypos - dl->ascent) <= y_coord | |
| 9090 && y_coord <= (int) (dl->ypos + dl->descent)) | |
| 9091 { | |
| 9092 int check_margin_glyphs = 0; | |
| 9093 struct display_block *db = get_display_block_from_line (dl, TEXT); | |
| 9094 struct rune *rb = 0; | |
| 9095 | |
| 9096 if (x_coord < dl->bounds.left_white | |
| 9097 || x_coord >= dl->bounds.right_white) | |
| 9098 check_margin_glyphs = 1; | |
| 9099 | |
| 9100 low_y_coord = dl->ypos - dl->ascent; | |
| 9101 high_y_coord = dl->ypos + dl->descent + 1; | |
| 9102 | |
| 9103 if (position == OVER_BORDER | |
| 9104 || position == OVER_OUTSIDE | |
| 9105 || check_margin_glyphs) | |
| 9106 { | |
| 9107 int x_check, left_bound; | |
| 9108 | |
| 9109 if (check_margin_glyphs) | |
| 9110 { | |
| 9111 x_check = x_coord; | |
| 9112 left_bound = dl->bounds.left_white; | |
| 9113 } | |
| 9114 else | |
| 9115 { | |
| 9116 x_check = high_x_coord; | |
| 9117 left_bound = frm_left; | |
| 9118 } | |
| 9119 | |
| 9120 if (Dynarr_length (db->runes)) | |
| 9121 { | |
| 9122 if (x_check <= left_bound) | |
| 9123 { | |
| 9124 if (dl->modeline) | |
| 4967 | 9125 *modeline_closest = Dynarr_begin (db->runes)->charpos; |
| 428 | 9126 else |
| 4967 | 9127 *closest = Dynarr_begin (db->runes)->charpos; |
| 428 | 9128 } |
| 9129 else | |
| 9130 { | |
| 9131 if (dl->modeline) | |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
9132 *modeline_closest = Dynarr_lastp (db->runes)->charpos; |
| 428 | 9133 else |
|
4844
91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents:
4815
diff
changeset
|
9134 *closest = Dynarr_lastp (db->runes)->charpos; |
| 428 | 9135 } |
| 9136 | |
| 9137 if (dl->modeline) | |
| 9138 *modeline_closest += dl->offset; | |
| 9139 else | |
| 9140 *closest += dl->offset; | |
| 9141 } | |
| 9142 else | |
| 9143 { | |
| 9144 /* #### What should be here. */ | |
| 9145 if (dl->modeline) | |
| 9146 *modeline_closest = 0; | |
| 9147 else | |
| 9148 *closest = 0; | |
| 9149 } | |
| 9150 | |
| 9151 if (check_margin_glyphs) | |
| 9152 { | |
| 9153 if (x_coord < dl->bounds.left_in | |
| 9154 || x_coord >= dl->bounds.right_in) | |
| 9155 { | |
| 9156 /* If we are over the outside margins then we | |
| 4187 | 9157 know the loop over the text block isn't going |
| 9158 to accomplish anything. So we go ahead and | |
| 9159 set what information we can right here and | |
| 9160 return. */ | |
| 428 | 9161 (*row)--; |
| 9162 *obj_y = y_coord - (dl->ypos - dl->ascent); | |
| 9163 get_position_object (dl, obj1, obj2, x_coord, | |
| 9164 &low_x_coord, &high_x_coord); | |
| 9165 | |
| 9166 UPDATE_CACHE_RETURN; | |
| 9167 } | |
| 9168 } | |
| 9169 else | |
| 9170 UPDATE_CACHE_RETURN; | |
| 9171 } | |
| 9172 | |
| 9173 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++) | |
| 9174 { | |
|
5486
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9175 if (*col == Dynarr_length (db->runes)) |
| 428 | 9176 { |
|
5486
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9177 /* 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
|
9178 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
|
9179 character. */ |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9180 if (dl->modeline) |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9181 *modeline_closest = dl->end_charpos + dl->offset; |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9182 else |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9183 *closest = dl->end_charpos + dl->offset; |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9184 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9185 if (check_margin_glyphs) |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9186 get_position_object (dl, obj1, obj2, x_coord, |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9187 &low_x_coord, &high_x_coord); |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9188 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9189 UPDATE_CACHE_RETURN; |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9190 } |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9191 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9192 rb = Dynarr_atp (db->runes, *col); |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9193 |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9194 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
|
9195 { |
| 428 | 9196 |
| 826 | 9197 *charpos = rb->charpos + dl->offset; |
| 428 | 9198 low_x_coord = rb->xpos; |
| 9199 high_x_coord = rb->xpos + rb->width; | |
| 9200 | |
| 9201 if (rb->type == RUNE_DGLYPH) | |
| 9202 { | |
| 9203 int elt = *col + 1; | |
| 9204 | |
| 9205 /* Find the first character after the glyph. */ | |
| 9206 while (elt < Dynarr_length (db->runes)) | |
| 9207 { | |
| 9208 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH) | |
| 9209 { | |
| 9210 if (dl->modeline) | |
| 9211 *modeline_closest = | |
| 826 | 9212 (Dynarr_atp (db->runes, elt)->charpos + |
| 428 | 9213 dl->offset); |
| 9214 else | |
| 9215 *closest = | |
| 826 | 9216 (Dynarr_atp (db->runes, elt)->charpos + |
| 428 | 9217 dl->offset); |
| 9218 break; | |
| 9219 } | |
| 9220 | |
| 9221 elt++; | |
| 9222 } | |
| 9223 | |
| 9224 /* In this case we failed to find a non-glyph | |
| 4187 | 9225 character so we return the last position |
| 9226 displayed on the line. */ | |
| 428 | 9227 if (elt == Dynarr_length (db->runes)) |
| 9228 { | |
| 9229 if (dl->modeline) | |
| 826 | 9230 *modeline_closest = dl->end_charpos + dl->offset; |
| 428 | 9231 else |
| 826 | 9232 *closest = dl->end_charpos + dl->offset; |
| 428 | 9233 really_over_nothing = 1; |
| 9234 } | |
| 9235 } | |
| 9236 else | |
| 9237 { | |
| 9238 if (dl->modeline) | |
| 826 | 9239 *modeline_closest = rb->charpos + dl->offset; |
| 428 | 9240 else |
| 826 | 9241 *closest = rb->charpos + dl->offset; |
| 428 | 9242 } |
| 9243 | |
| 9244 if (dl->modeline) | |
| 9245 { | |
| 9246 *row = window_displayed_height (*w); | |
| 9247 | |
| 9248 if (position == OVER_NOTHING) | |
| 9249 position = OVER_MODELINE; | |
| 9250 | |
| 9251 if (rb->type == RUNE_DGLYPH) | |
| 9252 { | |
| 9253 *obj1 = rb->object.dglyph.glyph; | |
| 9254 *obj2 = rb->object.dglyph.extent; | |
| 9255 } | |
| 9256 else if (rb->type == RUNE_CHAR) | |
| 9257 { | |
| 9258 *obj1 = Qnil; | |
| 9259 *obj2 = Qnil; | |
| 9260 } | |
| 9261 else | |
| 9262 { | |
| 9263 *obj1 = Qnil; | |
| 9264 *obj2 = Qnil; | |
| 9265 } | |
| 9266 | |
| 9267 UPDATE_CACHE_RETURN; | |
| 9268 } | |
|
5486
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9269 else if (rb->type == RUNE_CHAR |
|
58e320bde005
Handle redisplay edge case.
Mike Kupfer <mike.kupfer@xemacs.org>
parents:
5470
diff
changeset
|
9270 && rb->object.chr.ch == '\n') |
| 428 | 9271 { |
| 9272 (*row)--; | |
| 9273 /* At this point we may have glyphs in the right | |
| 4187 | 9274 inside margin. */ |
| 428 | 9275 if (check_margin_glyphs) |
| 9276 get_position_object (dl, obj1, obj2, x_coord, | |
| 9277 &low_x_coord, &high_x_coord); | |
| 9278 UPDATE_CACHE_RETURN; | |
| 9279 } | |
| 9280 else | |
| 9281 { | |
| 9282 (*row)--; | |
| 9283 if (rb->type == RUNE_DGLYPH) | |
| 9284 { | |
| 9285 *obj1 = rb->object.dglyph.glyph; | |
| 9286 *obj2 = rb->object.dglyph.extent; | |
| 9287 } | |
| 9288 else if (rb->type == RUNE_CHAR) | |
| 9289 { | |
| 9290 *obj1 = Qnil; | |
| 9291 *obj2 = Qnil; | |
| 9292 } | |
| 9293 else | |
| 9294 { | |
| 9295 *obj1 = Qnil; | |
| 9296 *obj2 = Qnil; | |
| 9297 } | |
| 9298 | |
| 9299 *obj_x = x_coord - rb->xpos; | |
| 9300 *obj_y = y_coord - (dl->ypos - dl->ascent); | |
| 9301 | |
| 9302 /* At this point we may have glyphs in the left | |
| 4187 | 9303 inside margin. */ |
| 428 | 9304 if (check_margin_glyphs) |
| 9305 get_position_object (dl, obj1, obj2, x_coord, 0, 0); | |
| 9306 | |
| 9307 if (position == OVER_NOTHING && !really_over_nothing) | |
| 9308 position = OVER_TEXT; | |
| 9309 | |
| 9310 UPDATE_CACHE_RETURN; | |
| 9311 } | |
| 9312 } | |
| 9313 } | |
| 9314 } | |
| 9315 } | |
| 9316 | |
| 9317 *row = Dynarr_length (dla) - 1; | |
| 9318 if (FRAME_WIN_P (f)) | |
| 9319 { | |
| 9320 int bot_elt = Dynarr_length (dla) - 1; | |
| 9321 | |
| 9322 if (bot_elt >= 0) | |
| 9323 { | |
| 9324 struct display_line *dl = Dynarr_atp (dla, bot_elt); | |
| 9325 int adj_area = y_coord - (dl->ypos + dl->descent); | |
| 9326 Lisp_Object lwin; | |
| 9327 int defheight; | |
| 9328 | |
| 793 | 9329 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
|
9330 default_face_width_and_height (lwin, 0, &defheight); |
| 428 | 9331 |
| 9332 *row += (adj_area / defheight); | |
| 9333 } | |
| 9334 } | |
| 9335 | |
| 9336 /* #### This should be checked out some more to determine what | |
| 9337 should really be going on. */ | |
| 9338 if (!MARKERP ((*w)->start[CURRENT_DISP])) | |
| 9339 *closest = 0; | |
| 9340 else | |
| 442 | 9341 *closest = end_of_last_line_may_error (*w, |
| 428 | 9342 marker_position ((*w)->start[CURRENT_DISP])); |
| 9343 *col = 0; | |
| 9344 UPDATE_CACHE_RETURN; | |
| 9345 } | |
| 9346 #undef UPDATE_CACHE_RETURN | |
| 9347 | |
| 9348 | |
| 9349 /***************************************************************************/ | |
| 9350 /* */ | |
| 9351 /* Lisp functions */ | |
| 9352 /* */ | |
| 9353 /***************************************************************************/ | |
| 9354 | |
| 9355 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /* | |
| 9356 Ensure that all minibuffers are correctly showing the echo area. | |
| 9357 */ | |
| 9358 ()) | |
| 9359 { | |
| 9360 Lisp_Object devcons, concons; | |
| 9361 | |
| 1318 | 9362 if (in_display) |
| 9363 return Qnil; | |
| 9364 | |
| 428 | 9365 DEVICE_LOOP_NO_BREAK (devcons, concons) |
| 9366 { | |
| 9367 struct device *d = XDEVICE (XCAR (devcons)); | |
| 9368 Lisp_Object frmcons; | |
| 9369 | |
| 1279 | 9370 if (DEVICE_STREAM_P (d)) |
| 9371 continue; | |
| 9372 | |
| 428 | 9373 DEVICE_FRAME_LOOP (frmcons, d) |
| 9374 { | |
| 9375 struct frame *f = XFRAME (XCAR (frmcons)); | |
| 853 | 9376 int depth; |
| 428 | 9377 |
| 9378 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f)) | |
| 9379 { | |
| 9380 Lisp_Object window = FRAME_MINIBUF_WINDOW (f); | |
| 442 | 9381 |
| 9382 MAYBE_DEVMETH (d, frame_output_begin, (f)); | |
| 9383 | |
| 428 | 9384 /* |
| 9385 * If the frame size has changed, there may be random | |
| 9386 * chud on the screen left from previous messages | |
| 9387 * because redisplay_frame hasn't been called yet. | |
| 9388 * Clear the screen to get rid of the potential mess. | |
| 9389 */ | |
| 9390 if (f->echo_area_garbaged) | |
| 9391 { | |
| 442 | 9392 MAYBE_DEVMETH (d, clear_frame, (f)); |
| 428 | 9393 f->echo_area_garbaged = 0; |
| 9394 } | |
| 853 | 9395 depth = enter_redisplay_critical_section (); |
| 428 | 9396 redisplay_window (window, 0); |
| 853 | 9397 exit_redisplay_critical_section (depth); |
| 442 | 9398 MAYBE_DEVMETH (d, frame_output_end, (f)); |
| 428 | 9399 } |
| 9400 } | |
| 9401 } | |
| 9402 | |
| 9403 return Qnil; | |
| 9404 } | |
| 9405 | |
| 9406 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /* | |
| 9407 Clear frame FRAME and output again what is supposed to appear on it. | |
| 9408 FRAME defaults to the selected frame if omitted. | |
| 9409 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9410 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9411 input and is guaranteed to proceed to completion. | |
| 9412 */ | |
| 9413 (frame, no_preempt)) | |
| 9414 { | |
| 9415 struct frame *f = decode_frame (frame); | |
| 9416 int count = specpdl_depth (); | |
| 9417 | |
| 9418 if (!NILP (no_preempt)) | |
| 853 | 9419 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9420 |
| 9421 f->clear = 1; | |
| 9422 redisplay_frame (f, 1); | |
| 9423 | |
| 442 | 9424 /* See the comment in Fredisplay_frame. */ |
| 9425 RESET_CHANGED_SET_FLAGS; | |
| 9426 | |
| 771 | 9427 return unbind_to (count); |
| 428 | 9428 } |
| 9429 | |
| 9430 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /* | |
| 9431 Ensure that FRAME's contents are correctly displayed. | |
| 9432 This differs from `redraw-frame' in that it only redraws what needs to | |
| 9433 be updated, as opposed to unconditionally clearing and redrawing | |
| 9434 the frame. | |
| 9435 FRAME defaults to the selected frame if omitted. | |
| 9436 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9437 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9438 input and is guaranteed to proceed to completion. | |
| 9439 */ | |
| 9440 (frame, no_preempt)) | |
| 9441 { | |
| 9442 struct frame *f = decode_frame (frame); | |
| 9443 int count = specpdl_depth (); | |
| 9444 | |
| 9445 if (!NILP (no_preempt)) | |
| 853 | 9446 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9447 |
| 9448 redisplay_frame (f, 1); | |
| 9449 | |
| 442 | 9450 /* If we don't reset the global redisplay flags here, subsequent |
| 9451 changes to the display will not get registered by redisplay | |
| 9452 because it thinks it already has registered changes. If you | |
| 9453 really knew what you were doing you could confuse redisplay by | |
| 9454 calling Fredisplay_frame while updating another frame. We assume | |
| 9455 that if you know what you are doing you will not be that | |
| 9456 stupid. */ | |
| 9457 RESET_CHANGED_SET_FLAGS; | |
| 9458 | |
| 771 | 9459 return unbind_to (count); |
| 428 | 9460 } |
| 9461 | |
| 9462 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /* | |
| 9463 Clear device DEVICE and output again what is supposed to appear on it. | |
| 9464 DEVICE defaults to the selected device if omitted. | |
| 9465 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9466 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9467 input and is guaranteed to proceed to completion. | |
| 9468 */ | |
| 9469 (device, no_preempt)) | |
| 9470 { | |
| 9471 struct device *d = decode_device (device); | |
| 9472 Lisp_Object frmcons; | |
| 9473 int count = specpdl_depth (); | |
| 9474 | |
| 9475 if (!NILP (no_preempt)) | |
| 853 | 9476 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9477 |
| 9478 DEVICE_FRAME_LOOP (frmcons, d) | |
| 9479 { | |
| 9480 XFRAME (XCAR (frmcons))->clear = 1; | |
| 9481 } | |
| 440 | 9482 redisplay_device (d, 0); |
| 428 | 9483 |
| 442 | 9484 /* See the comment in Fredisplay_frame. */ |
| 9485 RESET_CHANGED_SET_FLAGS; | |
| 9486 | |
| 771 | 9487 return unbind_to (count); |
| 428 | 9488 } |
| 9489 | |
| 9490 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /* | |
| 9491 Ensure that DEVICE's contents are correctly displayed. | |
| 9492 This differs from `redraw-device' in that it only redraws what needs to | |
| 9493 be updated, as opposed to unconditionally clearing and redrawing | |
| 9494 the device. | |
| 9495 DEVICE defaults to the selected device if omitted. | |
| 9496 Normally, redisplay is preempted as normal if input arrives. However, | |
| 9497 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for | |
| 9498 input and is guaranteed to proceed to completion. | |
| 853 | 9499 |
| 9500 Note: If you simply want everything redisplayed, the current idiom is | |
| 9501 `(sit-for 0)'. | |
| 428 | 9502 */ |
| 9503 (device, no_preempt)) | |
| 9504 { | |
| 9505 struct device *d = decode_device (device); | |
| 9506 int count = specpdl_depth (); | |
| 9507 | |
| 9508 if (!NILP (no_preempt)) | |
| 853 | 9509 internal_bind_int (&disable_preemption, 1 + disable_preemption); |
| 428 | 9510 |
| 440 | 9511 redisplay_device (d, 0); |
| 428 | 9512 |
| 442 | 9513 /* See the comment in Fredisplay_frame. */ |
| 9514 RESET_CHANGED_SET_FLAGS; | |
| 9515 | |
| 771 | 9516 return unbind_to (count); |
| 428 | 9517 } |
| 9518 | |
| 9519 /* Big lie. Big lie. This will force all modelines to be updated | |
| 9520 regardless if the all flag is set or not. It remains in existence | |
| 9521 solely for backwards compatibility. */ | |
| 9522 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /* | |
| 9523 Force the modeline of the current buffer to be redisplayed. | |
| 9524 With optional non-nil ALL, force redisplay of all modelines. | |
| 9525 */ | |
| 2286 | 9526 (UNUSED (all))) |
| 428 | 9527 { |
| 9528 MARK_MODELINE_CHANGED; | |
| 9529 return Qnil; | |
| 9530 } | |
| 9531 | |
| 9532 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /* | |
| 9533 Force an immediate update of the cursor on FRAME. | |
| 9534 FRAME defaults to the selected frame if omitted. | |
| 9535 */ | |
| 9536 (frame)) | |
| 9537 { | |
| 1279 | 9538 struct frame *f = decode_frame (frame); |
| 9539 | |
| 9540 if (!FRAME_STREAM_P (f)) | |
| 9541 redisplay_redraw_cursor (f, 1); | |
| 428 | 9542 return Qnil; |
| 9543 } | |
| 9544 | |
| 9545 | |
| 9546 /***************************************************************************/ | |
| 9547 /* */ | |
| 872 | 9548 /* Change flags */ |
| 428 | 9549 /* */ |
| 9550 /***************************************************************************/ | |
| 9551 | |
| 9552 static void | |
| 2286 | 9553 margin_width_changed_in_frame (Lisp_Object UNUSED (specifier), |
| 9554 struct frame *UNUSED (f), | |
| 9555 Lisp_Object UNUSED (oldval)) | |
| 428 | 9556 { |
| 9557 /* Nothing to be done? */ | |
| 9558 } | |
| 9559 | |
| 9560 int | |
| 2286 | 9561 redisplay_variable_changed (Lisp_Object UNUSED (sym), |
| 9562 Lisp_Object *UNUSED (val), | |
| 9563 Lisp_Object UNUSED (in_object), | |
| 9564 int UNUSED (flags)) | |
| 428 | 9565 { |
| 9566 /* #### clip_changed should really be renamed something like | |
| 9567 global_redisplay_change. */ | |
| 9568 MARK_CLIP_CHANGED; | |
| 9569 return 0; | |
| 9570 } | |
| 9571 | |
| 9572 /* This is called if the built-in glyphs have their properties | |
| 9573 changed. */ | |
| 9574 void | |
| 2286 | 9575 redisplay_glyph_changed (Lisp_Object UNUSED (glyph), |
| 9576 Lisp_Object UNUSED (property), Lisp_Object locale) | |
| 428 | 9577 { |
| 9578 if (WINDOWP (locale)) | |
| 9579 { | |
| 9580 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale)))); | |
| 9581 } | |
| 9582 else if (FRAMEP (locale)) | |
| 9583 { | |
| 9584 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale)); | |
| 9585 } | |
| 9586 else if (DEVICEP (locale)) | |
| 9587 { | |
| 9588 Lisp_Object frmcons; | |
| 9589 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale)) | |
| 9590 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons))); | |
| 9591 } | |
| 9592 else if (CONSOLEP (locale)) | |
| 9593 { | |
| 9594 Lisp_Object frmcons, devcons; | |
| 9595 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale)) | |
| 9596 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons))); | |
| 9597 } | |
| 9598 else /* global or buffer */ | |
| 9599 { | |
| 9600 Lisp_Object frmcons, devcons, concons; | |
| 9601 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) | |
| 9602 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons))); | |
| 9603 } | |
| 9604 } | |
| 9605 | |
| 9606 static void | |
| 2286 | 9607 text_cursor_visible_p_changed (Lisp_Object UNUSED (specifier), |
| 9608 struct window *w, Lisp_Object UNUSED (oldval)) | |
| 428 | 9609 { |
| 9610 if (XFRAME (w->frame)->init_finished) | |
| 9611 Fforce_cursor_redisplay (w->frame); | |
| 9612 } | |
| 9613 | |
| 872 | 9614 void |
| 9615 mark_buffers_changed (void) | |
| 9616 { | |
| 9617 MARK_TYPE_CHANGED (buffers); | |
| 9618 } | |
| 9619 | |
| 9620 void | |
| 9621 mark_clip_changed (void) | |
| 9622 { | |
| 9623 MARK_TYPE_CHANGED (clip); | |
| 9624 } | |
| 9625 | |
| 9626 void | |
| 9627 mark_extents_changed (void) | |
| 9628 { | |
| 9629 MARK_TYPE_CHANGED (extents); | |
| 9630 } | |
| 9631 | |
| 9632 void | |
| 9633 mark_icon_changed (void) | |
| 9634 { | |
| 9635 MARK_TYPE_CHANGED (icon); | |
| 9636 } | |
| 9637 | |
| 9638 void | |
| 9639 mark_menubar_changed (void) | |
| 9640 { | |
| 9641 MARK_TYPE_CHANGED (menubar); | |
| 9642 } | |
| 9643 | |
| 9644 void | |
| 9645 mark_modeline_changed (void) | |
| 9646 { | |
| 9647 MARK_TYPE_CHANGED (modeline); | |
| 9648 } | |
| 9649 | |
| 9650 void | |
| 9651 mark_point_changed (void) | |
| 9652 { | |
| 9653 MARK_TYPE_CHANGED (point); | |
| 9654 } | |
| 9655 | |
| 9656 void | |
| 9657 mark_toolbar_changed (void) | |
| 9658 { | |
| 9659 MARK_TYPE_CHANGED (toolbar); | |
| 9660 } | |
| 9661 | |
| 9662 void | |
| 9663 mark_gutter_changed (void) | |
| 9664 { | |
| 9665 MARK_TYPE_CHANGED (gutter); | |
| 9666 } | |
| 9667 | |
| 9668 void | |
| 9669 mark_glyphs_changed (void) | |
| 9670 { | |
| 9671 MARK_TYPE_CHANGED (glyphs); | |
| 9672 } | |
| 9673 | |
| 9674 void | |
| 9675 mark_subwindows_changed (void) | |
| 9676 { | |
| 9677 MARK_TYPE_CHANGED (subwindows); | |
| 9678 } | |
| 9679 | |
| 9680 void | |
| 9681 mark_subwindows_state_changed (void) | |
| 9682 { | |
| 9683 MARK_TYPE_CHANGED (subwindows_state); | |
| 9684 } | |
| 9685 | |
| 428 | 9686 #ifdef MEMORY_USAGE_STATS |
| 9687 | |
| 9688 | |
| 9689 /***************************************************************************/ | |
| 9690 /* */ | |
| 9691 /* memory usage computation */ | |
| 9692 /* */ | |
| 9693 /***************************************************************************/ | |
| 9694 | |
| 9695 static int | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9696 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
|
9697 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9698 return dyn ? Dynarr_memory_usage (dyn, ustats) : 0; |
| 428 | 9699 } |
| 9700 | |
| 9701 static int | |
| 9702 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
|
9703 struct usage_stats *ustats) |
| 428 | 9704 { |
| 9705 int total, i; | |
| 9706 | |
| 9707 if (!dyn) | |
| 9708 return 0; | |
| 9709 | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9710 total = Dynarr_memory_usage (dyn, ustats); |
| 428 | 9711 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
|
9712 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ustats); |
| 428 | 9713 |
| 9714 return total; | |
| 9715 } | |
| 9716 | |
| 9717 static int | |
| 9718 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
|
9719 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
|
9720 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9721 return dyn ? Dynarr_memory_usage (dyn, ustats) : 0; |
| 428 | 9722 } |
| 9723 | |
| 9724 int | |
| 9725 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
|
9726 struct usage_stats *ustats) |
| 428 | 9727 { |
| 9728 int total, i; | |
| 9729 | |
| 9730 if (!dyn) | |
| 9731 return 0; | |
| 9732 | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9733 total = Dynarr_memory_usage (dyn, ustats); |
| 428 | 9734 for (i = 0; i < Dynarr_largest (dyn); i++) |
| 9735 { | |
| 9736 struct display_line *dl = &Dynarr_at (dyn, i); | |
| 5198 | 9737 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
|
9738 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
|
9739 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ustats); |
| 428 | 9740 } |
| 9741 | |
| 9742 return total; | |
| 9743 } | |
| 9744 | |
| 9745 int | |
| 9746 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
|
9747 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
|
9748 { |
|
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5090
diff
changeset
|
9749 return dyn ? Dynarr_memory_usage (dyn, ustats) : 0; |
| 428 | 9750 } |
| 9751 | |
| 9752 #endif /* MEMORY_USAGE_STATS */ | |
| 9753 | |
| 1204 | 9754 #ifdef ERROR_CHECK_DISPLAY |
| 9755 | |
| 800 | 9756 static int |
| 2286 | 9757 sledgehammer_check_redisplay_structs_1 (struct window *w, |
| 9758 void *UNUSED (closure)) | |
| 800 | 9759 { |
| 9760 int i, j; | |
| 9761 display_line_dynarr *dl; | |
| 9762 | |
| 9763 dl = window_display_lines (w, CURRENT_DISP); | |
| 4187 | 9764 |
| 800 | 9765 for (i = 0; i < Dynarr_largest (dl); i++) |
| 9766 for (j = i + 1; j < Dynarr_largest (dl); j++) | |
| 9767 assert (Dynarr_atp (dl, i)->display_blocks != | |
| 9768 Dynarr_atp (dl, j)->display_blocks); | |
| 9769 | |
| 9770 dl = window_display_lines (w, DESIRED_DISP); | |
| 9771 | |
| 9772 for (i = 0; i < Dynarr_largest (dl); i++) | |
| 9773 for (j = i + 1; j < Dynarr_largest (dl); j++) | |
| 9774 assert (Dynarr_atp (dl, i)->display_blocks != | |
| 9775 Dynarr_atp (dl, j)->display_blocks); | |
| 9776 | |
| 9777 return 0; | |
| 9778 } | |
| 9779 | |
| 9780 static void | |
| 9781 sledgehammer_check_redisplay_structs (void) | |
| 9782 { | |
| 9783 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL); | |
| 9784 } | |
| 9785 | |
| 1204 | 9786 #endif /* ERROR_CHECK_DISPLAY */ |
| 9787 | |
| 428 | 9788 |
| 9789 /***************************************************************************/ | |
| 9790 /* */ | |
| 9791 /* initialization */ | |
| 9792 /* */ | |
| 9793 /***************************************************************************/ | |
| 9794 | |
| 9795 void | |
| 9796 init_redisplay (void) | |
| 9797 { | |
| 9798 disable_preemption = 0; | |
| 9799 preemption_count = 0; | |
| 9800 | |
| 9801 #ifndef PDUMP | |
| 9802 if (!initialized) | |
| 9803 #endif | |
| 9804 { | |
| 440 | 9805 if (!cmotion_display_lines) |
| 9806 cmotion_display_lines = Dynarr_new (display_line); | |
| 867 | 9807 if (!mode_spec_ibyte_string) |
| 9808 mode_spec_ibyte_string = Dynarr_new (Ibyte); | |
| 440 | 9809 if (!formatted_string_extent_dynarr) |
| 9810 formatted_string_extent_dynarr = Dynarr_new (EXTENT); | |
| 9811 if (!formatted_string_extent_start_dynarr) | |
| 9812 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount); | |
| 9813 if (!formatted_string_extent_end_dynarr) | |
| 9814 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount); | |
| 9815 if (!internal_cache) | |
| 9816 internal_cache = Dynarr_new (line_start_cache); | |
| 428 | 9817 } |
| 9818 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9819 if (!initialized) |
| 428 | 9820 return; |
| 9821 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9822 if (noninteractive) |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9823 { |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9824 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
|
9825 return; |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9826 } |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9827 |
| 428 | 9828 /* If the user wants to use a window system, we shouldn't bother |
| 9829 initializing the terminal. This is especially important when the | |
| 9830 terminal is so dumb that emacs gives up before and doesn't bother | |
| 9831 using the window system. | |
| 9832 | |
| 9833 If the DISPLAY environment variable is set, try to use X, and die | |
| 9834 with an error message if that doesn't work. */ | |
| 9835 | |
| 9836 #ifdef HAVE_X_WINDOWS | |
| 9837 if (!strcmp (display_use, "x")) | |
| 9838 { | |
| 9839 /* Some stuff checks this way early. */ | |
| 9840 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
|
9841 Vinitial_device_type = Qx; |
| 428 | 9842 return; |
| 9843 } | |
| 9844 #endif /* HAVE_X_WINDOWS */ | |
| 9845 | |
| 462 | 9846 #ifdef HAVE_GTK |
| 9847 if (!strcmp (display_use, "gtk")) | |
| 9848 { | |
| 9849 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
|
9850 Vinitial_device_type = Qgtk; |
| 462 | 9851 return; |
| 9852 } | |
| 9853 #endif | |
| 9854 | |
| 428 | 9855 #ifdef HAVE_MS_WINDOWS |
| 9856 if (!strcmp (display_use, "mswindows")) | |
| 9857 { | |
| 9858 /* Some stuff checks this way early. */ | |
| 9859 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
|
9860 Vinitial_device_type = Qmswindows; |
| 428 | 9861 return; |
| 9862 } | |
| 9863 #endif /* HAVE_MS_WINDOWS */ | |
| 9864 | |
| 9865 #ifdef HAVE_TTY | |
| 9866 /* If no window system has been specified, try to use the terminal. */ | |
| 9867 if (!isatty (0)) | |
| 9868 { | |
| 9869 stderr_out ("XEmacs: standard input is not a tty\n"); | |
| 9870 exit (1); | |
| 9871 } | |
| 9872 | |
| 9873 /* Look at the TERM variable */ | |
| 771 | 9874 if (!egetenv ("TERM")) |
| 428 | 9875 { |
| 9876 stderr_out ("Please set the environment variable TERM; see tset(1).\n"); | |
| 9877 exit (1); | |
| 9878 } | |
| 9879 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
9880 Vinitial_device_type = Qtty; |
| 428 | 9881 return; |
| 9882 #else /* not HAVE_TTY */ | |
| 9883 /* No DISPLAY specified, and no TTY support. */ | |
| 9884 stderr_out ("XEmacs: Cannot open display.\n\ | |
| 9885 Please set the environmental variable DISPLAY to an appropriate value.\n"); | |
| 9886 exit (1); | |
| 9887 #endif | |
| 9888 /* Unreached. */ | |
| 9889 } | |
| 9890 | |
| 9891 void | |
| 9892 syms_of_redisplay (void) | |
| 9893 { | |
| 563 | 9894 DEFSYMBOL (Qcursor_in_echo_area); |
| 9895 DEFSYMBOL (Qdisplay_warning_buffer); | |
| 9896 DEFSYMBOL (Qbar_cursor); | |
| 9897 DEFSYMBOL (Qtop_bottom); | |
| 9898 DEFSYMBOL (Qbuffer_list_changed_hook); | |
| 428 | 9899 |
| 9900 DEFSUBR (Fredisplay_echo_area); | |
| 9901 DEFSUBR (Fredraw_frame); | |
| 9902 DEFSUBR (Fredisplay_frame); | |
| 9903 DEFSUBR (Fredraw_device); | |
| 9904 DEFSUBR (Fredisplay_device); | |
| 9905 DEFSUBR (Fredraw_modeline); | |
| 9906 DEFSUBR (Fforce_cursor_redisplay); | |
| 9907 } | |
| 9908 | |
| 9909 void | |
| 9910 vars_of_redisplay (void) | |
| 9911 { | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4928
diff
changeset
|
9912 QSin_redisplay = build_defer_string ("(in redisplay)"); |
| 1292 | 9913 staticpro (&QSin_redisplay); |
| 428 | 9914 |
| 1318 | 9915 Vpost_redisplay_actions = Qnil; |
| 9916 staticpro (&Vpost_redisplay_actions); | |
| 9917 | |
| 428 | 9918 #if 0 |
| 9919 staticpro (&last_arrow_position); | |
| 9920 staticpro (&last_arrow_string); | |
| 9921 last_arrow_position = Qnil; | |
| 9922 last_arrow_string = Qnil; | |
| 9923 #endif /* 0 */ | |
| 9924 | |
| 9925 /* #### Probably temporary */ | |
| 9926 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /* | |
| 9927 \(Temporary) Setting this will impact the performance of the internal | |
| 9928 line start cache. | |
| 9929 */ ); | |
| 9930 cache_adjustment = 2; | |
| 9931 | |
| 1268 | 9932 DEFVAR_INT ("maximum-preempts", &max_preempts /* |
| 9933 Maximum number of times redisplay can be preempted by user input. | |
| 9934 */ ); | |
| 9935 max_preempts = INIT_MAX_PREEMPTS; | |
| 9936 | |
| 428 | 9937 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /* |
| 9938 Minimum pixel height for clipped bottom display line. | |
| 9939 A clipped line shorter than this won't be displayed. | |
| 9940 */ , | |
| 9941 redisplay_variable_changed); | |
| 9942 vertical_clip = 5; | |
| 9943 | |
| 9944 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /* | |
| 9945 Minimum visible area for clipped glyphs at right boundary. | |
| 9946 Clipped glyphs shorter than this won't be displayed. | |
| 9947 Only pixmap glyph instances are currently allowed to be clipped. | |
| 9948 */ , | |
| 9949 redisplay_variable_changed); | |
| 9950 horizontal_clip = 5; | |
| 9951 | |
| 9952 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /* | |
| 9953 String displayed by modeline-format's "%m" specification. | |
| 9954 */ ); | |
| 9955 Vglobal_mode_string = Qnil; | |
| 9956 | |
| 9957 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /* | |
| 9958 Marker for where to display an arrow on top of the buffer text. | |
| 9959 This must be the beginning of a line in order to work. | |
| 9960 See also `overlay-arrow-string'. | |
| 9961 */ , | |
| 9962 redisplay_variable_changed); | |
| 9963 Voverlay_arrow_position = Qnil; | |
| 9964 | |
| 9965 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /* | |
| 442 | 9966 String or glyph to display as an arrow. See also `overlay-arrow-position'. |
| 444 | 9967 \(Note that despite the name of this variable, it can be set to a glyph as |
| 442 | 9968 well as a string.) |
| 428 | 9969 */ , |
| 9970 redisplay_variable_changed); | |
| 9971 Voverlay_arrow_string = Qnil; | |
| 9972 | |
| 9973 DEFVAR_INT ("scroll-step", &scroll_step /* | |
| 9974 *The number of lines to try scrolling a window by when point moves out. | |
| 9975 If that fails to bring point back on frame, point is centered instead. | |
| 9976 If this is zero, point is always centered after it moves off screen. | |
| 9977 */ ); | |
| 9978 scroll_step = 0; | |
| 9979 | |
| 9980 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /* | |
| 9981 *Scroll up to this many lines, to bring point back on screen. | |
| 9982 */ ); | |
| 9983 scroll_conservatively = 0; | |
| 9984 | |
| 9985 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows", | |
| 9986 &truncate_partial_width_windows /* | |
| 9987 *Non-nil means truncate lines in all windows less than full frame wide. | |
| 9988 */ , | |
| 9989 redisplay_variable_changed); | |
| 9990 truncate_partial_width_windows = 1; | |
| 9991 | |
| 442 | 9992 DEFVAR_LISP ("visible-bell", &Vvisible_bell /* |
| 9993 *Non-nil substitutes a visual signal for the audible bell. | |
| 9994 | |
| 9995 Default behavior is to flash the whole screen. On some platforms, | |
| 9996 special effects are available using the following values: | |
| 9997 | |
| 3025 | 9998 `display' Flash the whole screen (ie, the default behavior). |
| 9999 `top-bottom' Flash only the top and bottom lines of the selected frame. | |
| 442 | 10000 |
| 10001 When effects are unavailable on a platform, the visual bell is the | |
| 10002 default, whole screen. (Currently only X supports any special effects.) | |
| 428 | 10003 */ ); |
| 442 | 10004 Vvisible_bell = Qnil; |
| 428 | 10005 |
| 10006 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /* | |
| 10007 *Non-nil means no need to redraw entire frame after suspending. | |
| 10008 A non-nil value is useful if the terminal can automatically preserve | |
| 10009 Emacs's frame display when you reenter Emacs. | |
| 10010 It is up to you to set this variable if your terminal can do that. | |
| 10011 */ ); | |
| 10012 no_redraw_on_reenter = 0; | |
| 10013 | |
| 10014 DEFVAR_LISP ("window-system", &Vwindow_system /* | |
| 10015 A symbol naming the window-system under which Emacs is running, | |
| 10016 such as `x', or nil if emacs is running on an ordinary terminal. | |
| 10017 | |
| 10018 Do not use this variable, except for GNU Emacs compatibility, as it | |
| 10019 gives wrong values in a multi-device environment. Use `console-type' | |
| 10020 instead. | |
| 10021 */ ); | |
| 10022 Vwindow_system = Qnil; | |
| 10023 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10024 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
|
10025 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
|
10026 |
|
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10027 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
|
10028 to Lisp what type the initial device to be created should be. |
| 428 | 10029 */ ); |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4418
diff
changeset
|
10030 Vinitial_device_type = Qnil; |
| 428 | 10031 |
| 10032 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /* | |
| 10033 Non-nil means put cursor in minibuffer, at end of any message there. | |
| 10034 */ ); | |
| 10035 cursor_in_echo_area = 0; | |
| 10036 | |
| 10037 /* #### Shouldn't this be generalized as follows: | |
| 10038 | |
| 10039 if nil, use block cursor. | |
| 10040 if a number, use a bar cursor of that width. | |
| 10041 Otherwise, use a 1-pixel bar cursor. | |
| 10042 | |
| 10043 #### Or better yet, this variable should be trashed entirely | |
| 10044 (use a Lisp-magic variable to maintain compatibility) | |
| 10045 and a specifier `cursor-shape' added, which allows a block | |
| 10046 cursor, a bar cursor, a flashing block or bar cursor, | |
| 10047 maybe a caret cursor, etc. */ | |
| 10048 | |
| 10049 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /* | |
| 448 | 10050 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2. |
| 428 | 10051 */ ); |
| 10052 Vbar_cursor = Qnil; | |
| 10053 | |
| 442 | 10054 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /* |
| 10055 Function or functions to call when a frame's buffer list has changed. | |
| 10056 This is called during redisplay, before redisplaying each frame. | |
| 10057 Functions on this hook are called with one argument, the frame. | |
| 10058 */ ); | |
| 10059 Vbuffer_list_changed_hook = Qnil; | |
| 10060 | |
| 428 | 10061 DEFVAR_INT ("display-warning-tick", &display_warning_tick /* |
| 10062 Bump this to tell the C code to call `display-warning-buffer' | |
| 10063 at next redisplay. You should not normally change this; the function | |
| 10064 `display-warning' automatically does this at appropriate times. | |
| 10065 */ ); | |
| 10066 display_warning_tick = 0; | |
| 10067 | |
| 10068 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /* | |
| 10069 Non-nil means inhibit display of warning messages. | |
| 10070 You should *bind* this, not set it. Any pending warning messages | |
| 10071 will be displayed when the binding no longer applies. | |
| 10072 */ ); | |
| 10073 /* reset to 0 by startup.el after the splash screen has displayed. | |
| 10074 This way, the warnings don't obliterate the splash screen. */ | |
| 10075 inhibit_warning_display = 1; | |
| 10076 | |
| 10077 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /* | |
| 10078 *Non-nil means column display number starts at 1. | |
| 10079 */ ); | |
| 10080 column_number_start_at_one = 0; | |
| 10081 } | |
| 10082 | |
| 10083 void | |
| 10084 specifier_vars_of_redisplay (void) | |
| 10085 { | |
| 10086 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /* | |
| 10087 *Width of left margin. | |
| 10088 This is a specifier; use `set-specifier' to change it. | |
| 10089 */ ); | |
| 10090 Vleft_margin_width = Fmake_specifier (Qnatnum); | |
| 10091 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero))); | |
| 10092 set_specifier_caching (Vleft_margin_width, | |
| 438 | 10093 offsetof (struct window, left_margin_width), |
| 428 | 10094 some_window_value_changed, |
| 438 | 10095 offsetof (struct frame, left_margin_width), |
| 444 | 10096 margin_width_changed_in_frame, 0); |
| 428 | 10097 |
| 10098 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /* | |
| 10099 *Width of right margin. | |
| 10100 This is a specifier; use `set-specifier' to change it. | |
| 10101 */ ); | |
| 10102 Vright_margin_width = Fmake_specifier (Qnatnum); | |
| 10103 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero))); | |
| 10104 set_specifier_caching (Vright_margin_width, | |
| 438 | 10105 offsetof (struct window, right_margin_width), |
| 428 | 10106 some_window_value_changed, |
| 438 | 10107 offsetof (struct frame, right_margin_width), |
| 444 | 10108 margin_width_changed_in_frame, 0); |
| 428 | 10109 |
| 10110 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /* | |
| 10111 *Minimum ascent height of lines. | |
| 10112 This is a specifier; use `set-specifier' to change it. | |
| 10113 */ ); | |
| 10114 Vminimum_line_ascent = Fmake_specifier (Qnatnum); | |
| 10115 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero))); | |
| 10116 set_specifier_caching (Vminimum_line_ascent, | |
| 438 | 10117 offsetof (struct window, minimum_line_ascent), |
| 428 | 10118 some_window_value_changed, |
| 444 | 10119 0, 0, 0); |
| 428 | 10120 |
| 10121 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /* | |
| 10122 *Minimum descent height of lines. | |
| 10123 This is a specifier; use `set-specifier' to change it. | |
| 10124 */ ); | |
| 10125 Vminimum_line_descent = Fmake_specifier (Qnatnum); | |
| 10126 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero))); | |
| 10127 set_specifier_caching (Vminimum_line_descent, | |
| 438 | 10128 offsetof (struct window, minimum_line_descent), |
| 428 | 10129 some_window_value_changed, |
| 444 | 10130 0, 0, 0); |
| 428 | 10131 |
| 10132 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /* | |
| 10133 *Non-nil means use the left outside margin as extra whitespace when | |
| 3025 | 10134 displaying `whitespace' or `inside-margin' glyphs. |
| 428 | 10135 This is a specifier; use `set-specifier' to change it. |
| 10136 */ ); | |
| 10137 Vuse_left_overflow = Fmake_specifier (Qboolean); | |
| 10138 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil))); | |
| 10139 set_specifier_caching (Vuse_left_overflow, | |
| 438 | 10140 offsetof (struct window, use_left_overflow), |
| 428 | 10141 some_window_value_changed, |
| 444 | 10142 0, 0, 0); |
| 428 | 10143 |
| 10144 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /* | |
| 10145 *Non-nil means use the right outside margin as extra whitespace when | |
| 3025 | 10146 displaying `whitespace' or `inside-margin' glyphs. |
| 428 | 10147 This is a specifier; use `set-specifier' to change it. |
| 10148 */ ); | |
| 10149 Vuse_right_overflow = Fmake_specifier (Qboolean); | |
| 10150 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil))); | |
| 10151 set_specifier_caching (Vuse_right_overflow, | |
| 438 | 10152 offsetof (struct window, use_right_overflow), |
| 428 | 10153 some_window_value_changed, |
| 444 | 10154 0, 0, 0); |
| 428 | 10155 |
| 10156 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /* | |
| 10157 *Non-nil means the text cursor is visible (this is usually the case). | |
| 10158 This is a specifier; use `set-specifier' to change it. | |
| 10159 */ ); | |
| 10160 Vtext_cursor_visible_p = Fmake_specifier (Qboolean); | |
| 10161 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt))); | |
| 10162 set_specifier_caching (Vtext_cursor_visible_p, | |
| 438 | 10163 offsetof (struct window, text_cursor_visible_p), |
| 428 | 10164 text_cursor_visible_p_changed, |
| 444 | 10165 0, 0, 0); |
| 428 | 10166 |
| 10167 } |