summaryrefslogtreecommitdiff
path: root/XKBgeom.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:42 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:42 +0000
commitbae998431a7285432eb5d1f519246e41832754d0 (patch)
tree895cbb677014dc825c146cab62e8158673ec97c0 /XKBgeom.h
parent209ae2d4c9cd739e91f8c00184dc6f2f48e21100 (diff)
Diffstat (limited to 'XKBgeom.h')
-rw-r--r--XKBgeom.h20
1 files changed, 16 insertions, 4 deletions
diff --git a/XKBgeom.h b/XKBgeom.h
index 6538e9e..aff8917 100644
--- a/XKBgeom.h
+++ b/XKBgeom.h
@@ -24,10 +24,13 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.9 2002/09/18 17:11:40 tsi Exp $ */
#ifndef _XKBGEOM_H_
#define _XKBGEOM_H_
+#include <X11/extensions/XKBstr.h>
+
#ifdef XKB_IN_SERVER
#define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias
#define XkbAddGeomColor SrvXkbAddGeomColor
@@ -63,8 +66,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbFreeGeomOverlayKeys SrvXkbFreeGeomOverlayKeys
#define XkbFreeGeomOverlayRows SrvXkbFreeGeomOverlayRows
#define XkbFreeGeomOverlays SrvXkbFreeGeomOverlays
-#define XkbFreeGeomKeys SrvXKbFreeGeomKeys
-#define XkbFreeGeomRows SrvXKbFreeGeomRows
+#define XkbFreeGeomKeys SrvXkbFreeGeomKeys
+#define XkbFreeGeomRows SrvXkbFreeGeomRows
#define XkbFreeGeomSections SrvXkbFreeGeomSections
#define XkbFreeGeomPoints SrvXkbFreeGeomPoints
#define XkbFreeGeomOutlines SrvXkbFreeGeomOutlines
@@ -110,7 +113,7 @@ typedef struct _XkbShape {
XkbOutlinePtr primary;
XkbBoundsRec bounds;
} XkbShapeRec, *XkbShapePtr;
-#define XkbOutlineIndex(s,o) ((o)-&(s)->outlines[0])
+#define XkbOutlineIndex(s,o) ((int)((o)-&(s)->outlines[0]))
typedef struct _XkbShapeDoodad {
Atom name;
@@ -292,7 +295,7 @@ typedef struct _XkbGeometry {
XkbDoodadPtr doodads;
XkbKeyAliasPtr key_aliases;
} XkbGeometryRec;
-#define XkbGeomColorIndex(g,c) ((c)-&(g)->colors[0])
+#define XkbGeomColorIndex(g,c) ((int)((c)-&(g)->colors[0]))
#define XkbGeomPropertiesMask (1<<0)
#define XkbGeomColorsMask (1<<1)
@@ -682,6 +685,15 @@ XkbAllocGeometry(
#endif
);
+extern Status
+XkbSetGeometry(
+#if NeedFunctionPrototypes
+ Display * /* dpy */,
+ unsigned /* deviceSpec */,
+ XkbGeometryPtr /* geom */
+#endif
+);
+
extern Bool
XkbComputeShapeTop(
#if NeedFunctionPrototypes