(make_hdr): Undo June 16 change.

[gnu-emacs] / src / dispextern.h

diff --git a/src/dispextern.h b/src/dispextern.h
index a89e73120c9016c5553d9874c4bc4572c407791c..8826ebdecc501acf254058bf59de4f6e3645039e 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1,5 +1,5 @@
 /* Interface definitions for display code.
-   Copyright (C) 1985, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -29,12 +29,19 @@ struct face
     /* If this is non-zero, it is a GC we can use without modification
        to represent this face.  */
     GC gc;
+
+    /* If we have ever called get_cached_face on this face structure,
+       here is the index in face_vector of the face it returned.  It
+       might not be valid any more, but it's a good place to start
+       looking; get_cached_face tries to use this to avoid searching
+       all of face_vector.  */
+    int cached_index;
   
     /* Pixel value for foreground color.  */
-    int foreground;
+    EMACS_UINT foreground;
   
     /* Pixel value for background color.  */
-    int background;
+    EMACS_UINT background;
   
     /* Font used for this face.  */
     XFontStruct *font;
@@ -112,7 +119,9 @@ struct frame_glyphs
     /* highlight[n] != 0 iff line n is highlighted.  */
     char *highlight;
 
-    /* Buffer offset of this line's first char.  */
+    /* Buffer offset of this line's first char.
+       This is not really implemented, and cannot be,
+       and should be deleted.  */
     int   *bufp;
 
 #ifdef HAVE_X_WINDOWS
@@ -129,6 +138,35 @@ struct frame_glyphs
     /* Largest font ascent on this line.  */
     short *max_ascent;
 #endif /* HAVE_X_WINDOWS */
+
+    /* Mapping of coordinate pairs to buffer positions.
+       This field holds a vector indexed by row number.
+       Its elements are vectors indexed by column number.
+       Each element of these vectors is a buffer position, 0, or -1.
+
+       For a column where the image of a text character starts,
+       the element value is the buffer position of that character.
+       When a window's screen line starts in mid character,
+       the element for the line's first column (at the window's left margin)
+       is that character's position.
+       For successive columns within a multicolumn character,
+       the element is -1.
+       For the column just beyond the last glyph on a line,
+       the element is the buffer position of the end of the line.
+       For following columns within the same window, the element is 0.
+       For rows past the end of the accessible buffer text,
+       the window's first column has ZV and other columns have 0.
+
+       Mode lines and vertical separator lines have 0.
+
+       The column of a window's left margin
+       always has a positive value (a buffer position), not 0 or -1,
+       for each line in that window's interior.  */
+
+    int **charstarts;
+
+    /* This holds all the space in the subvectors of the charstarts field.  */
+    int *total_charstarts;
   };
 
 extern void get_display_line ();