summaryrefslogtreecommitdiff
path: root/grid.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:47 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:47 +0000
commit1c20e3f37a2359a11ec7cccfe740b4a39d4decf1 (patch)
treed941faa69a7da1ac3eff60f02f35e770aad60b73 /grid.h
parent961d4493f519b5b093581e111997f894b1675d48 (diff)
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'grid.h')
-rw-r--r--grid.h28
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_ */