Commit 1f08ae1e56c8cd99485447146bfd8528e6576c2b
2009-03-28T11:56:35
Expose all the geometry allocation subroutines We need a couple in xkbcomp, but they might also be needed externally, too.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 7eafa77..502ede0 100644
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -147,6 +147,48 @@ extern void
XkbcFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap);
extern int
+XkbcAllocGeomProps(XkbGeometryPtr geom, int nProps);
+
+extern int
+XkbcAllocGeomColors(XkbGeometryPtr geom, int nColors);
+
+extern int
+XkbcAllocGeomKeyAliases(XkbGeometryPtr geom, int nKeyAliases);
+
+extern int
+XkbcAllocGeomShapes(XkbGeometryPtr geom, int nShapes);
+
+extern int
+XkbcAllocGeomSections(XkbGeometryPtr geom, int nSections);
+
+extern int
+XkbcAllocGeomOverlays(XkbSectionPtr section, int nOverlays);
+
+extern int
+XkbcAllocGeomOverlayRows(XkbOverlayPtr overlay, int nRows);
+
+extern int
+XkbcAllocGeomOverlayKeys(XkbOverlayRowPtr row, int nKeys);
+
+extern int
+XkbcAllocGeomDoodads(XkbGeometryPtr geom, int nDoodads);
+
+extern int
+XkbcAllocGeomSectionDoodads(XkbSectionPtr section, int nDoodads);
+
+extern int
+XkbcAllocGeomOutlines(XkbShapePtr shape, int nOL);
+
+extern int
+XkbcAllocGeomRows(XkbSectionPtr section, int nRows);
+
+extern int
+XkbcAllocGeomPoints(XkbOutlinePtr ol, int nPts);
+
+extern int
+XkbcAllocGeomKeys(XkbRowPtr row, int nKeys);
+
+extern int
XkbcAllocGeometry(XkbcDescPtr xkb, XkbGeometrySizesPtr sizes);
extern void
diff --git a/src/galloc.c b/src/galloc.c
index 67499d6..ad8946d 100644
--- a/src/galloc.c
+++ b/src/galloc.c
@@ -477,6 +477,90 @@ _XkbGeomAlloc(char **old, unsigned short *num, unsigned short *total,
(n), sizeof(XkbOverlayKeyRec))
int
+XkbcAllocGeomProps(XkbGeometryPtr geom, int nProps)
+{
+ return _XkbAllocProps(geom, nProps);
+}
+
+int
+XkbcAllocGeomColors(XkbGeometryPtr geom, int nColors)
+{
+ return _XkbAllocColors(geom, nColors);
+}
+
+int
+XkbcAllocGeomKeyAliases(XkbGeometryPtr geom, int nKeyAliases)
+{
+ return _XkbAllocKeyAliases(geom, nKeyAliases);
+}
+
+int
+XkbcAllocGeomShapes(XkbGeometryPtr geom, int nShapes)
+{
+ return _XkbAllocShapes(geom, nShapes);
+}
+
+int
+XkbcAllocGeomSections(XkbGeometryPtr geom, int nSections)
+{
+ return _XkbAllocSections(geom, nSections);
+}
+
+int
+XkbcAllocGeomOverlays(XkbSectionPtr section, int nOverlays)
+{
+ return _XkbAllocOverlays(section, nOverlays);
+}
+
+int
+XkbcAllocGeomOverlayRows(XkbOverlayPtr overlay, int nRows)
+{
+ return _XkbAllocOverlayRows(overlay, nRows);
+}
+
+int
+XkbcAllocGeomOverlayKeys(XkbOverlayRowPtr row, int nKeys)
+{
+ return _XkbAllocOverlayKeys(row, nKeys);
+}
+
+int
+XkbcAllocGeomDoodads(XkbGeometryPtr geom, int nDoodads)
+{
+ return _XkbAllocDoodads(geom, nDoodads);
+}
+
+int
+XkbcAllocGeomSectionDoodads(XkbSectionPtr section, int nDoodads)
+{
+ return _XkbAllocDoodads(section, nDoodads);
+}
+
+int
+XkbcAllocGeomOutlines(XkbShapePtr shape, int nOL)
+{
+ return _XkbAllocOutlines(shape, nOL);
+}
+
+int
+XkbcAllocGeomRows(XkbSectionPtr section, int nRows)
+{
+ return _XkbAllocRows(section, nRows);
+}
+
+int
+XkbcAllocGeomPoints(XkbOutlinePtr ol, int nPts)
+{
+ return _XkbAllocPoints(ol, nPts);
+}
+
+int
+XkbcAllocGeomKeys(XkbRowPtr row, int nKeys)
+{
+ return _XkbAllocKeys(row, nKeys);
+}
+
+int
XkbcAllocGeometry(XkbcDescPtr xkb, XkbGeometrySizesPtr sizes)
{
XkbGeometryPtr geom;