aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-07-02 19:45:28 +0300
committerEli Zaretskii2013-07-02 19:45:28 +0300
commit9f899da0a19f8313fe7e38a90198a8bdda6ba133 (patch)
tree8a7ac0cdb19c9268e0e06802276bdda359b2ae35 /src
parent102ae68de45940b2d3524b6e166301fdae9652e7 (diff)
downloademacs-9f899da0a19f8313fe7e38a90198a8bdda6ba133.tar.gz
emacs-9f899da0a19f8313fe7e38a90198a8bdda6ba133.zip
Improve commentary for glyph.charpos and glyph.object.
Diffstat (limited to 'src')
-rw-r--r--src/dispextern.h27
1 files changed, 16 insertions, 11 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index a1dbc5e2024..74e59679667 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -365,21 +365,26 @@ struct glyph_slice
365struct glyph 365struct glyph
366{ 366{
367 /* Position from which this glyph was drawn. If `object' below is a 367 /* Position from which this glyph was drawn. If `object' below is a
368 Lisp string, this is a position in that string. If it is a 368 Lisp string, this is an index into that string. If it is a
369 buffer, this is a position in that buffer. A value of -1 369 buffer, this is a position in that buffer. In addition, some
370 together with a null object means glyph is a truncation glyph at 370 special glyphs have special values for this:
371 the start of a row. Right truncation and continuation glyphs at 371
372 the right edge of a row have their position set to the next 372 glyph standing for newline at end of line 0
373 buffer position that is not shown on this row. Glyphs inserted 373 empty space after the end of the line -1
374 by redisplay, such as the empty space after the end of a line on 374 overlay arrow on a TTY -1
375 TTYs, or the overlay-arrow on a TTY, have this set to -1. */ 375 glyph at EOB that ends in a newline -1
376 left truncation glyphs: -1
377 right truncation/continuation glyphs next buffer position
378 glyph standing for newline of an empty line buffer position of newline
379 stretch glyph at left edge of R2L lines buffer position of newline */
376 ptrdiff_t charpos; 380 ptrdiff_t charpos;
377 381
378 /* Lisp object source of this glyph. Currently either a buffer or a 382 /* Lisp object source of this glyph. Currently either a buffer or a
379 string, if the glyph was produced from characters which came from 383 string, if the glyph was produced from characters which came from
380 a buffer or a string; or 0 if the glyph was inserted by redisplay 384 a buffer or a string; or Lisp integer zero (a.k.a. "null object")
381 for its own purposes, such as padding or truncation/continuation 385 if the glyph was inserted by redisplay for its own purposes, such
382 glyphs, or the overlay-arrow glyphs on TTYs. */ 386 as padding or truncation/continuation glyphs, or the
387 overlay-arrow glyphs on TTYs. */
383 Lisp_Object object; 388 Lisp_Object object;
384 389
385 /* Width in pixels. */ 390 /* Width in pixels. */