XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 26 insertions, 2 deletions

diff --git a/grid.h b/grid.h
index 8cadafc..3d9cc7d 100644
--- a/grid.h
+++ b/grid.h
@@ -26,10 +26,16 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
+/* $XFree86: xc/programs/xfd/grid.h,v 1.4 2002/07/23 01:45:41 tsi Exp $ */
 
 #ifndef _FontGrid_h_
 #define _FontGrid_h_
 
+#ifdef XRENDER
+#include <X11/Xft/Xft.h>
+#include <X11/extensions/Xrender.h>
+#endif
+
 typedef struct _FontGridRec *FontGridWidget;
 extern WidgetClass fontgridWidgetClass;
 
@@ -60,15 +66,24 @@ extern WidgetClass fontgridWidgetClass;
 #define XtNgridWidth "gridWidth"
 #define XtCGridWidth "GridWidth"
 
+#define XtRXftColor "XftColor"
+
+#define XtNface "face"
+#define XtCFace "Face"
+#define XtRXftFont "XftFont"
+
 typedef struct _FontGridCharRec {
+#ifdef XRENDER
+    XftFont *		theface;
+#endif
     XFontStruct *	thefont;
-    XChar2b		thechar;
+    long		thechar;
 } FontGridCharRec;
 
 extern void GetFontGridCellDimensions(
 #if NeedFunctionPrototypes
    Widget,
-   Dimension *,
+   long *,
    int *,
    int *
 #endif
@@ -78,8 +93,17 @@ extern void GetPrevNextStates(
 #if NeedFunctionPrototypes
     Widget,
     Bool *,
+    Bool *,
+    Bool *,
     Bool *
 #endif
 );
 
+long
+GridFirstChar (Widget w);
+
+long
+GridLastChar (Widget w);
+
+    
 #endif /* _FontGrid_h_ */