frame-override-unsplittable/inhibit-frame-unsplittable name change.

[gnu-emacs] / src / dispextern.h

diff --git a/src/dispextern.h b/src/dispextern.h
index d62797195ca159930237348247e5d213278b9ac9..34cd850ee36107a708d71bd3d03893d905e744c5 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef _DISPEXTERN_H_
 #define _DISPEXTERN_H_
@@ -32,21 +33,35 @@ extern int display_completed;
 #include "msdos.h"
 #endif
 
+#ifdef HAVE_NTGUI
+#include "w32gui.h"
+#endif
+
 #ifdef HAVE_FACES
 struct face
   {
     /* If this is non-zero, it is a GC we can use without modification
-       to represent this face.  */
+       to represent this face.  Used only for ASCII characters.  */
     GC gc;
-  
+
+    /* GC used for non-ASCII characters.  */
+    GC non_ascii_gc;
+
     /* Pixel value for foreground color.  */
     EMACS_UINT foreground;
   
     /* Pixel value for background color.  */
     EMACS_UINT background;
   
-    /* Font used for this face.  */
+    /* Font used for this face.  If any fontset is set for this face,
+       this points to a `font' slot of the struct `font_info' for an
+       ASCII font of the fontset.  In that case, we should not call
+       XFreeFont on it because the font may still be used somewhere
+       else.  */
     XFontStruct *font;
+
+    /* Fontset ID if any fontset is set for this face, else -1.  */
+    int fontset;
   
     /* Background stipple or bitmap used for this face.  */
     Pixmap stipple;
@@ -65,9 +80,11 @@ typedef struct face *FACE;
 
 #define FACE_HAS_GC(f) ((f)->gc)
 #define FACE_GC(f) ((f)->gc)
+#define FACE_NON_ASCII_GC(f) ((f)->non_ascii_gc)
 #define FACE_FOREGROUND(f) ((f)->foreground)
 #define FACE_BACKGROUND(f) ((f)->background)
 #define FACE_FONT(f) ((f)->font)
+#define FACE_FONTSET(f) ((f)->fontset)
 #define FACE_STIPPLE(f) ((f)->stipple)
 #define FACE_UNDERLINE_P(f) ((f)->underline)
 
@@ -94,9 +111,7 @@ typedef int FACE;
 
 struct frame_glyphs
   {
-#ifdef MULTI_FRAME
     struct  frame *frame;      /* Frame these glyphs belong to.  */
-#endif /* MULTI_FRAME */
     int height;
     int width;
 
@@ -127,7 +142,7 @@ struct frame_glyphs
        and should be deleted.  */
     int   *bufp;
 
-#ifdef HAVE_X_WINDOWS
+#ifdef HAVE_WINDOW_SYSTEM
     /* Pixel position of top left corner of line.  */
     short *top_left_x;
     short *top_left_y;
@@ -140,7 +155,7 @@ struct frame_glyphs
 
     /* Largest font ascent on this line.  */
     short *max_ascent;
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
 
     /* Mapping of coordinate pairs to buffer positions.
        This field holds a vector indexed by row number.