2009-03-19 17:57:01 -06:00
|
|
|
/*
|
|
|
|
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
|
|
|
|
|
|
|
|
Permission to use, copy, modify, and distribute this
|
|
|
|
software and its documentation for any purpose and without
|
|
|
|
fee is hereby granted, provided that the above copyright
|
|
|
|
notice appear in all copies and that both that copyright
|
|
|
|
notice and this permission notice appear in supporting
|
|
|
|
documentation, and that the name of Silicon Graphics not be
|
|
|
|
used in advertising or publicity pertaining to distribution
|
|
|
|
of the software without specific prior written permission.
|
|
|
|
Silicon Graphics makes no representation about the suitability
|
|
|
|
of this software for any purpose. It is provided "as is"
|
|
|
|
without any express or implied warranty.
|
|
|
|
|
|
|
|
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
|
|
|
|
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
|
|
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
|
|
|
|
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
|
|
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
|
|
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
|
|
|
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|
|
|
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
2009-03-05 19:20:15 -07:00
|
|
|
#include "X11/extensions/XKBcommon.h"
|
|
|
|
#include "XKBcommonint.h"
|
2009-03-19 17:57:01 -06:00
|
|
|
#include <X11/X.h>
|
|
|
|
#include <X11/Xdefs.h>
|
|
|
|
#include <X11/extensions/XKB.h>
|
|
|
|
|
|
|
|
static void
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomLeafElems(Bool freeAll, int first, int count,
|
|
|
|
unsigned short *num_inout, unsigned short *sz_inout,
|
|
|
|
char **elems, unsigned int elem_sz)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
if (freeAll || !(*elems)) {
|
|
|
|
*num_inout = *sz_inout = 0;
|
|
|
|
if (*elems) {
|
|
|
|
_XkbFree(*elems);
|
|
|
|
*elems = NULL;
|
|
|
|
}
|
|
|
|
return;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if ((first >= (*num_inout)) || (first < 0) || (count < 1))
|
|
|
|
return;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (first + count >= (*num_inout))
|
|
|
|
/* truncating the array is easy */
|
|
|
|
(*num_inout) = first;
|
2009-03-19 17:57:01 -06:00
|
|
|
else {
|
2009-03-25 16:41:21 -06:00
|
|
|
char *ptr = *elems;
|
|
|
|
int extra = ((*num_inout) - first + count) * elem_sz;
|
|
|
|
|
|
|
|
if (extra > 0)
|
|
|
|
memmove(&ptr[first * elem_sz], &ptr[(first + count) * elem_sz],
|
|
|
|
extra);
|
|
|
|
|
|
|
|
(*num_inout) -= count;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
typedef void (*ContentsClearFunc)(char *priv);
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
static void
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(Bool freeAll, int first, int count,
|
|
|
|
unsigned short *num_inout, unsigned short *sz_inout,
|
|
|
|
char **elems, unsigned int elem_sz,
|
|
|
|
ContentsClearFunc freeFunc)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
int i;
|
|
|
|
char *ptr;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
if (freeAll) {
|
2009-03-25 16:41:21 -06:00
|
|
|
first = 0;
|
|
|
|
count = *num_inout;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
2009-03-25 16:41:21 -06:00
|
|
|
else if ((first >= (*num_inout)) || (first < 0) || (count < 1))
|
|
|
|
return;
|
|
|
|
else if (first + count > (*num_inout))
|
|
|
|
count = (*num_inout) - first;
|
|
|
|
|
|
|
|
if (!(*elems))
|
|
|
|
return;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
if (freeFunc) {
|
2009-03-25 16:41:21 -06:00
|
|
|
ptr = *elems;
|
|
|
|
ptr += first * elem_sz;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
(*freeFunc)(ptr);
|
|
|
|
ptr += elem_sz;
|
|
|
|
}
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
2009-03-25 16:41:21 -06:00
|
|
|
|
2009-03-19 17:57:01 -06:00
|
|
|
if (freeAll) {
|
2009-03-25 16:41:21 -06:00
|
|
|
*num_inout = *sz_inout = 0;
|
|
|
|
if (*elems) {
|
|
|
|
_XkbFree(*elems);
|
|
|
|
*elems = NULL;
|
|
|
|
}
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
2009-03-25 16:41:21 -06:00
|
|
|
else if (first + count >= (*num_inout))
|
|
|
|
*num_inout = first;
|
2009-03-19 17:57:01 -06:00
|
|
|
else {
|
2009-03-25 16:41:21 -06:00
|
|
|
i = ((*num_inout) - first + count) * elem_sz;
|
|
|
|
ptr = *elems;
|
|
|
|
memmove(&ptr[first * elem_sz], &ptr[(first + count) * elem_sz], i);
|
|
|
|
(*num_inout) -= count;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearProperty(char *prop_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbPropertyPtr prop = (XkbPropertyPtr)prop_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
if (prop->name) {
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFree(prop->name);
|
|
|
|
prop->name = NULL;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
if (prop->value) {
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFree(prop->value);
|
|
|
|
prop->value = NULL;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
&geom->num_properties, &geom->sz_properties,
|
|
|
|
(char **)&geom->properties,
|
|
|
|
sizeof(XkbPropertyRec),
|
|
|
|
_XkbClearProperty);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomLeafElems(freeAll, first, count,
|
|
|
|
&geom->num_key_aliases, &geom->sz_key_aliases,
|
|
|
|
(char **)&geom->key_aliases,
|
|
|
|
sizeof(XkbKeyAliasRec));
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearColor(char *color_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbColorPtr color = (XkbColorPtr)color_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
if (color->spec)
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFree(color->spec);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
&geom->num_colors, &geom->sz_colors,
|
|
|
|
(char **)&geom->colors, sizeof(XkbColorRec),
|
|
|
|
_XkbClearColor);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomPoints(XkbOutlinePtr outline, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomLeafElems(freeAll, first, count,
|
|
|
|
&outline->num_points, &outline->sz_points,
|
|
|
|
(char **)&outline->points, sizeof(XkbPointRec));
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearOutline(char *outline_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbOutlinePtr outline = (XkbOutlinePtr)outline_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (outline->points)
|
|
|
|
XkbcFreeGeomPoints(outline, 0, outline->num_points, True);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomOutlines(XkbShapePtr shape, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
&shape->num_outlines, &shape->sz_outlines,
|
|
|
|
(char **)&shape->outlines, sizeof(XkbOutlineRec),
|
|
|
|
_XkbClearOutline);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearShape(char *shape_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbShapePtr shape = (XkbShapePtr)shape_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
if (shape->outlines)
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomOutlines(shape, 0, shape->num_outlines, True);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomShapes(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
&geom->num_shapes, &geom->sz_shapes,
|
|
|
|
(char **)&geom->shapes, sizeof(XkbShapeRec),
|
|
|
|
_XkbClearShape);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomOverlayKeys(XkbOverlayRowPtr row, int first, int count,
|
|
|
|
Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomLeafElems(freeAll, first, count,
|
|
|
|
&row->num_keys, &row->sz_keys,
|
|
|
|
(char **)&row->keys, sizeof(XkbOverlayKeyRec));
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearOverlayRow(char *row_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbOverlayRowPtr row = (XkbOverlayRowPtr)row_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (row->keys)
|
|
|
|
XkbcFreeGeomOverlayKeys(row, 0, row->num_keys, True);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomOverlayRows(XkbOverlayPtr overlay, int first, int count,
|
|
|
|
Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
&overlay->num_rows, &overlay->sz_rows,
|
|
|
|
(char **)&overlay->rows,
|
|
|
|
sizeof(XkbOverlayRowRec),
|
|
|
|
_XkbClearOverlayRow);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearOverlay(char *overlay_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbOverlayPtr overlay = (XkbOverlayPtr)overlay_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (overlay->rows)
|
|
|
|
XkbcFreeGeomOverlayRows(overlay, 0, overlay->num_rows, True);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomOverlays(XkbSectionPtr section, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
§ion->num_overlays, §ion->sz_overlays,
|
|
|
|
(char **)§ion->overlays,
|
|
|
|
sizeof(XkbOverlayRec),
|
|
|
|
_XkbClearOverlay);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomLeafElems(freeAll, first, count,
|
|
|
|
&row->num_keys, &row->sz_keys,
|
|
|
|
(char **)&row->keys, sizeof(XkbKeyRec));
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearRow(char *row_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbRowPtr row = (XkbRowPtr)row_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (row->keys)
|
|
|
|
XkbcFreeGeomKeys(row, 0, row->num_keys, True);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomRows(XkbSectionPtr section, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
§ion->num_rows, §ion->sz_rows,
|
|
|
|
(char **)§ion->rows, sizeof(XkbRowRec),
|
|
|
|
_XkbClearRow);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearSection(char *section_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbSectionPtr section = (XkbSectionPtr)section_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (section->rows)
|
|
|
|
XkbcFreeGeomRows(section, 0, section->num_rows, True);
|
|
|
|
if (section->doodads) {
|
|
|
|
XkbcFreeGeomDoodads(section->doodads, section->num_doodads, True);
|
|
|
|
section->doodads = NULL;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomSections(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
|
|
|
&geom->num_sections, &geom->sz_sections,
|
|
|
|
(char **)&geom->sections, sizeof(XkbSectionRec),
|
|
|
|
_XkbClearSection);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
_XkbClearDoodad(char *doodad_in)
|
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbDoodadPtr doodad = (XkbDoodadPtr)doodad_in;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
switch (doodad->any.type) {
|
2009-03-25 16:41:21 -06:00
|
|
|
case XkbTextDoodad:
|
|
|
|
if (doodad->text.text) {
|
|
|
|
_XkbFree(doodad->text.text);
|
|
|
|
doodad->text.text = NULL;
|
|
|
|
}
|
|
|
|
if (doodad->text.font) {
|
|
|
|
_XkbFree(doodad->text.font);
|
|
|
|
doodad->text.font = NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XkbLogoDoodad:
|
|
|
|
if (doodad->logo.logo_name) {
|
|
|
|
_XkbFree(doodad->logo.logo_name);
|
|
|
|
doodad->logo.logo_name = NULL;
|
|
|
|
}
|
|
|
|
break;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
int i;
|
|
|
|
XkbDoodadPtr doodad;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
|
|
|
if (doodads) {
|
2009-03-25 16:41:21 -06:00
|
|
|
for (i = 0, doodad = doodads; i < nDoodads; i++, doodad++)
|
|
|
|
_XkbClearDoodad((char *)doodad);
|
|
|
|
if (freeAll)
|
|
|
|
_XkbFree(doodads);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
if (!geom)
|
|
|
|
return;
|
|
|
|
|
2009-03-19 17:57:01 -06:00
|
|
|
if (freeMap)
|
2009-03-25 16:41:21 -06:00
|
|
|
which = XkbGeomAllMask;
|
|
|
|
|
|
|
|
if ((which & XkbGeomPropertiesMask) && geom->properties)
|
|
|
|
XkbcFreeGeomProperties(geom, 0, geom->num_properties, True);
|
|
|
|
|
|
|
|
if ((which & XkbGeomColorsMask) && geom->colors)
|
|
|
|
XkbcFreeGeomColors(geom, 0, geom->num_colors, True);
|
|
|
|
|
|
|
|
if ((which & XkbGeomShapesMask) && geom->shapes)
|
|
|
|
XkbcFreeGeomShapes(geom, 0, geom->num_shapes, True);
|
|
|
|
|
|
|
|
if ((which & XkbGeomSectionsMask) && geom->sections)
|
|
|
|
XkbcFreeGeomSections(geom, 0, geom->num_sections, True);
|
|
|
|
|
|
|
|
if ((which & XkbGeomDoodadsMask) && geom->doodads) {
|
|
|
|
XkbcFreeGeomDoodads(geom->doodads, geom->num_doodads, True);
|
|
|
|
geom->doodads = NULL;
|
|
|
|
geom->num_doodads = geom->sz_doodads = 0;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
2009-03-25 16:41:21 -06:00
|
|
|
|
|
|
|
if ((which & XkbGeomKeyAliasesMask) && geom->key_aliases)
|
|
|
|
XkbcFreeGeomKeyAliases(geom, 0, geom->num_key_aliases, True);
|
|
|
|
|
2009-03-19 17:57:01 -06:00
|
|
|
if (freeMap) {
|
2009-03-25 16:41:21 -06:00
|
|
|
if (geom->label_font) {
|
|
|
|
_XkbFree(geom->label_font);
|
|
|
|
geom->label_font = NULL;
|
|
|
|
}
|
|
|
|
_XkbFree(geom);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-03-25 16:41:21 -06:00
|
|
|
_XkbGeomAlloc(char **old, unsigned short *num, unsigned short *total,
|
|
|
|
int num_new, size_t sz_elem)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
if (num_new < 1)
|
|
|
|
return Success;
|
|
|
|
|
|
|
|
if (!(*old))
|
|
|
|
*num = *total = 0;
|
|
|
|
|
|
|
|
if ((*num) + num_new <= (*total))
|
|
|
|
return Success;
|
|
|
|
|
|
|
|
*total = (*num) + num_new;
|
|
|
|
|
|
|
|
if (*old)
|
|
|
|
*old = (char *)_XkbRealloc(*old, (*total) * sz_elem);
|
|
|
|
else
|
|
|
|
*old = (char *)_XkbCalloc(*total, sz_elem);
|
|
|
|
if (!(*old)) {
|
|
|
|
*total = *num = 0;
|
|
|
|
return BadAlloc;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (*num > 0) {
|
|
|
|
char *tmp = *old;
|
|
|
|
bzero(&tmp[sz_elem * (*num)], num_new * sz_elem);
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
2009-03-25 16:41:21 -06:00
|
|
|
|
2009-03-19 17:57:01 -06:00
|
|
|
return Success;
|
|
|
|
}
|
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
#define _XkbAllocProps(g, n) _XkbGeomAlloc((char **)&(g)->properties, \
|
|
|
|
&(g)->num_properties, \
|
|
|
|
&(g)->sz_properties, \
|
|
|
|
(n), sizeof(XkbPropertyRec))
|
|
|
|
#define _XkbAllocColors(g, n) _XkbGeomAlloc((char **)&(g)->colors, \
|
|
|
|
&(g)->num_colors, \
|
|
|
|
&(g)->sz_colors, \
|
|
|
|
(n), sizeof(XkbColorRec))
|
|
|
|
#define _XkbAllocShapes(g, n) _XkbGeomAlloc((char **)&(g)->shapes, \
|
|
|
|
&(g)->num_shapes, \
|
|
|
|
&(g)->sz_shapes, \
|
|
|
|
(n), sizeof(XkbShapeRec))
|
|
|
|
#define _XkbAllocSections(g, n) _XkbGeomAlloc((char **)&(g)->sections, \
|
|
|
|
&(g)->num_sections, \
|
|
|
|
&(g)->sz_sections, \
|
|
|
|
(n), sizeof(XkbSectionRec))
|
|
|
|
#define _XkbAllocDoodads(g, n) _XkbGeomAlloc((char **)&(g)->doodads, \
|
|
|
|
&(g)->num_doodads, \
|
|
|
|
&(g)->sz_doodads, \
|
|
|
|
(n), sizeof(XkbDoodadRec))
|
|
|
|
#define _XkbAllocKeyAliases(g, n) _XkbGeomAlloc((char **)&(g)->key_aliases, \
|
|
|
|
&(g)->num_key_aliases, \
|
|
|
|
&(g)->sz_key_aliases, \
|
|
|
|
(n), sizeof(XkbKeyAliasRec))
|
|
|
|
|
|
|
|
#define _XkbAllocOutlines(s, n) _XkbGeomAlloc((char **)&(s)->outlines, \
|
|
|
|
&(s)->num_outlines, \
|
|
|
|
&(s)->sz_outlines, \
|
|
|
|
(n), sizeof(XkbOutlineRec))
|
|
|
|
#define _XkbAllocRows(s, n) _XkbGeomAlloc((char **)&(s)->rows, \
|
|
|
|
&(s)->num_rows, \
|
|
|
|
&(s)->sz_rows, \
|
|
|
|
(n), sizeof(XkbRowRec))
|
|
|
|
#define _XkbAllocPoints(o, n) _XkbGeomAlloc((char **)&(o)->points, \
|
|
|
|
&(o)->num_points, \
|
|
|
|
&(o)->sz_points, \
|
|
|
|
(n), sizeof(XkbPointRec))
|
|
|
|
#define _XkbAllocKeys(r, n) _XkbGeomAlloc((char **)&(r)->keys, \
|
|
|
|
&(r)->num_keys, \
|
|
|
|
&(r)->sz_keys, \
|
|
|
|
(n), sizeof(XkbKeyRec))
|
|
|
|
#define _XkbAllocOverlays(s, n) _XkbGeomAlloc((char **)&(s)->overlays, \
|
|
|
|
&(s)->num_overlays, \
|
|
|
|
&(s)->sz_overlays, \
|
|
|
|
(n), sizeof(XkbOverlayRec))
|
|
|
|
#define _XkbAllocOverlayRows(o, n) _XkbGeomAlloc((char **)&(o)->rows, \
|
|
|
|
&(o)->num_rows, \
|
|
|
|
&(o)->sz_rows, \
|
|
|
|
(n), sizeof(XkbOverlayRowRec))
|
|
|
|
#define _XkbAllocOverlayKeys(r, n) _XkbGeomAlloc((char **)&(r)->keys, \
|
|
|
|
&(r)->num_keys, \
|
|
|
|
&(r)->sz_keys, \
|
|
|
|
(n), sizeof(XkbOverlayKeyRec))
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-28 12:56:35 -06:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2009-03-19 17:57:01 -06:00
|
|
|
int
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbcAllocGeometry(XkbcDescPtr xkb, XkbGeometrySizesPtr sizes)
|
2009-03-19 17:57:01 -06:00
|
|
|
{
|
2009-03-25 16:41:21 -06:00
|
|
|
XkbGeometryPtr geom;
|
|
|
|
int rtrn;
|
2009-03-19 17:57:01 -06:00
|
|
|
|
2009-03-25 16:41:21 -06:00
|
|
|
if (!xkb->geom) {
|
|
|
|
xkb->geom = _XkbTypedCalloc(1, XkbGeometryRec);
|
|
|
|
if (!xkb->geom)
|
|
|
|
return BadAlloc;
|
2009-03-19 17:57:01 -06:00
|
|
|
}
|
2009-03-25 16:41:21 -06:00
|
|
|
geom = xkb->geom;
|
|
|
|
|
|
|
|
if ((sizes->which & XkbGeomPropertiesMask) &&
|
|
|
|
((rtrn = _XkbAllocProps(geom, sizes->num_properties)) != Success))
|
|
|
|
goto bail;
|
|
|
|
|
|
|
|
if ((sizes->which & XkbGeomColorsMask) &&
|
|
|
|
((rtrn = _XkbAllocColors(geom, sizes->num_colors)) != Success))
|
|
|
|
goto bail;
|
|
|
|
|
|
|
|
if ((sizes->which & XkbGeomShapesMask) &&
|
|
|
|
((rtrn = _XkbAllocShapes(geom, sizes->num_shapes)) != Success))
|
|
|
|
goto bail;
|
|
|
|
|
|
|
|
if ((sizes->which & XkbGeomSectionsMask) &&
|
|
|
|
((rtrn = _XkbAllocSections(geom, sizes->num_sections)) != Success))
|
|
|
|
goto bail;
|
|
|
|
|
|
|
|
if ((sizes->which & XkbGeomDoodadsMask) &&
|
|
|
|
((rtrn = _XkbAllocDoodads(geom, sizes->num_doodads)) != Success))
|
|
|
|
goto bail;
|
|
|
|
|
|
|
|
if ((sizes->which & XkbGeomKeyAliasesMask) &&
|
|
|
|
((rtrn = _XkbAllocKeyAliases(geom, sizes->num_key_aliases)) != Success))
|
|
|
|
goto bail;
|
|
|
|
|
2009-03-19 17:57:01 -06:00
|
|
|
return Success;
|
2009-03-25 16:41:21 -06:00
|
|
|
bail:
|
|
|
|
XkbcFreeGeometry(geom, XkbGeomAllMask, True);
|
|
|
|
xkb->geom = NULL;
|
2009-03-19 17:57:01 -06:00
|
|
|
return rtrn;
|
|
|
|
}
|