if (((old->defs.fileID == new->defs.fileID)
&& (warningLevel > 0)) || (warningLevel > 9))
{
- WARN1("Multiple definitions for the \"%s\" property\n",
+ WARN("Multiple definitions for the \"%s\" property\n",
new->name);
- ACTION2("Ignoring \"%s\", using \"%s\"\n", old->value,
+ ACTION("Ignoring \"%s\", using \"%s\"\n", old->value,
new->value);
}
if (old->value)
if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
|| (warningLevel > 9))
{
- WARN1("Multiple definitions for \"%s\" property\n", new->name);
- ACTION2("Using \"%s\", ignoring \"%s\" \n", old->value,
+ WARN("Multiple definitions for \"%s\" property\n", new->name);
+ ACTION("Using \"%s\", ignoring \"%s\" \n", old->value,
new->value);
}
return True;
if (type != NULL)
{
old = info->shapes;
- WARN3("Unknown shape \"%s\" for %s %s\n",
+ WARN("Unknown shape \"%s\" for %s %s\n",
XkbcAtomText(name), type, which);
if (old)
{
- ACTION1("Using default shape %s instead\n", shText(old));
+ ACTION("Using default shape %s instead\n", shText(old));
return old;
}
ACTION("No default shape; definition ignored\n");
if (((old->defs.fileID == new->defs.fileID)
&& (warningLevel > 0)) || (warningLevel > 9))
{
- WARN1("Duplicate shape name \"%s\"\n", shText(old));
+ WARN("Duplicate shape name \"%s\"\n", shText(old));
ACTION("Using last definition\n");
}
*old = *new;
if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
|| (warningLevel > 9))
{
- WARN1("Multiple shapes named \"%s\"\n", shText(old));
+ WARN("Multiple shapes named \"%s\"\n", shText(old));
ACTION("Using first definition\n");
}
return True;
if (((old->defs.fileID == new->defs.fileID)
&& (warningLevel > 0)) || (warningLevel > 9))
{
- WARN1("Multiple doodads named \"%s\"\n",
+ WARN("Multiple doodads named \"%s\"\n",
XkbcAtomText(old->name));
ACTION("Using last definition\n");
}
if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
|| (warningLevel > 9))
{
- WARN1("Multiple doodads named \"%s\"\n",
+ WARN("Multiple doodads named \"%s\"\n",
XkbcAtomText(old->name));
ACTION("Using first definition\n");
}
if (((old->defs.fileID == new->defs.fileID)
&& (warningLevel > 0)) || (warningLevel > 9))
{
- WARN2
+ WARN
("Multiple overlays named \"%s\" for section \"%s\"\n",
XkbcAtomText(old->name), XkbcAtomText(si->name));
ACTION("Using last definition\n");
if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
|| (warningLevel > 9))
{
- WARN2("Multiple doodads named \"%s\" in section \"%s\"\n",
+ WARN("Multiple doodads named \"%s\" in section \"%s\"\n",
XkbcAtomText(old->name), XkbcAtomText(si->name));
ACTION("Using first definition\n");
}
if (warningLevel > 0)
{
WSGO("Couldn't allocate a new OverlayInfo\n");
- ACTION2
+ ACTION
("Overlay \"%s\" in section \"%s\" will be incomplete\n",
XkbcAtomText(old->name), XkbcAtomText(si->name));
}
if (((old->defs.fileID == new->defs.fileID)
&& (warningLevel > 0)) || (warningLevel > 9))
{
- WARN1("Duplicate shape name \"%s\"\n", shText(old));
+ WARN("Duplicate shape name \"%s\"\n", shText(old));
ACTION("Using last definition\n");
}
*old = *new;
if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
|| (warningLevel > 9))
{
- WARN1("Multiple shapes named \"%s\"\n", shText(old));
+ WARN("Multiple shapes named \"%s\"\n", shText(old));
ACTION("Using first definition\n");
}
return True;
if ((tmp.ival < 0) || (tmp.ival > XkbGeomMaxPriority))
{
info->errorCount++;
- ERROR2("Doodad priority %d out of range (must be 0..%d)\n",
+ ERROR("Doodad priority %d out of range (must be 0..%d)\n",
tmp.ival, XkbGeomMaxPriority);
- ACTION1("Priority for doodad %s not changed", ddText(di));
+ ACTION("Priority for doodad %s not changed", ddText(di));
return False;
}
di->defs.defined |= _GD_Priority;
case XkbLogoDoodad:
return SetLogoDoodadField(di, field, arrayNdx, value, si, info);
}
- WSGO1("Unknown doodad type %d in SetDoodadField\n",
+ WSGO("Unknown doodad type %d in SetDoodadField\n",
(unsigned int) di->type);
- ACTION2("Definition of %s in %s ignored\n", field, ddText(di));
+ ACTION("Definition of %s in %s ignored\n", field, ddText(di));
return False;
}
if ((tmp.ival < 0) || (tmp.ival > XkbGeomMaxPriority))
{
info->errorCount++;
- ERROR2("Section priority %d out of range (must be 0..%d)\n",
+ ERROR("Section priority %d out of range (must be 0..%d)\n",
tmp.ival, XkbGeomMaxPriority);
- ACTION1("Priority for section %s not changed", scText(si));
+ ACTION("Priority for section %s not changed", scText(si));
return False;
}
si->priority = tmp.ival;
{
info->errorCount++;
ERROR("Property values must be type string\n");
- ACTION1("Ignoring illegal definition of \"%s\" property\n", property);
+ ACTION("Ignoring illegal definition of \"%s\" property\n", property);
return False;
}
pi.value = result.str;
if (ndx != NULL)
{
info->errorCount++;
- ERROR1("The %s geometry property is not an array\n", field.str);
+ ERROR("The %s geometry property is not an array\n", field.str);
ACTION("Ignoring illegal property definition\n");
return False;
}
if (elem.str)
{
WARN("Assignment to field of unknown element\n");
- ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+ ACTION("No value assigned to %s.%s\n", elem.str, field.str);
return False;
}
if (tmp.ival < 1)
{
WARN("Keyboard width must be positive\n");
- ACTION1("Ignoring illegal keyboard width %s\n",
+ ACTION("Ignoring illegal keyboard width %s\n",
XkbcGeomFPText(tmp.ival));
return True;
}
if (info->widthMM != 0)
{
WARN("Keyboard width multiply defined\n");
- ACTION1("Using last definition (%s),", XkbcGeomFPText(tmp.ival));
- INFO1(" ignoring first (%s)\n", XkbcGeomFPText(info->widthMM));
+ ACTION("Using last definition (%s),", XkbcGeomFPText(tmp.ival));
+ INFO(" ignoring first (%s)\n", XkbcGeomFPText(info->widthMM));
}
info->widthMM = tmp.ival;
return True;
if (tmp.ival < 1)
{
WARN("Keyboard height must be positive\n");
- ACTION1("Ignoring illegal keyboard height %s\n",
+ ACTION("Ignoring illegal keyboard height %s\n",
XkbcGeomFPText(tmp.ival));
return True;
}
if (info->heightMM != 0)
{
WARN("Keyboard height multiply defined\n");
- ACTION1("Using last definition (%s),", XkbcGeomFPText(tmp.ival));
- INFO1(" ignoring first (%s)\n", XkbcGeomFPText(info->heightMM));
+ ACTION("Using last definition (%s),", XkbcGeomFPText(tmp.ival));
+ INFO(" ignoring first (%s)\n", XkbcGeomFPText(info->heightMM));
}
info->heightMM = tmp.ival;
return True;
if ((tmp.ival < 40) || (tmp.ival > 2550))
{
info->errorCount++;
- ERROR1("Illegal font size %d (must be 4..255)\n", tmp.ival);
+ ERROR("Illegal font size %d (must be 4..255)\n", tmp.ival);
ACTION("Ignoring font size in keyboard geometry\n");
return False;
}
if (def->nOutlines < 1)
{
- WARN1("Shape \"%s\" has no outlines\n", shText(si));
+ WARN("Shape \"%s\" has no outlines\n", shText(si));
ACTION("Definition ignored\n");
return True;
}
si->outlines = uTypedCalloc(def->nOutlines, XkbOutlineRec);
if (!si->outlines)
{
- ERROR1("Couldn't allocate outlines for \"%s\"\n", shText(si));
+ ERROR("Couldn't allocate outlines for \"%s\"\n", shText(si));
ACTION("Definition ignored\n");
info->errorCount++;
return False;
outline->points = uTypedCalloc(ol->nPoints, XkbPointRec);
if (!outline->points)
{
- ERROR1("Can't allocate points for \"%s\"\n", shText(si));
+ ERROR("Can't allocate points for \"%s\"\n", shText(si));
ACTION("Definition ignored\n");
info->errorCount++;
return False;
si->approx = outline;
else
{
- WARN1("Multiple approximations for \"%s\"\n",
+ WARN("Multiple approximations for \"%s\"\n",
shText(si));
ACTION("Treating all but the first as normal outlines\n");
}
si->primary = outline;
else
{
- WARN1("Multiple primary outlines for \"%s\"\n",
+ WARN("Multiple primary outlines for \"%s\"\n",
shText(si));
ACTION("Treating all but the first as normal outlines\n");
}
}
else
{
- WARN2("Unknown outline type %s for \"%s\"\n", str,
+ WARN("Unknown outline type %s for \"%s\"\n", str,
shText(si));
ACTION("Treated as a normal outline\n");
}
}
if (nOut != si->nOutlines)
{
- WSGO2("Expected %d outlines, got %d\n",
+ WSGO("Expected %d outlines, got %d\n",
(unsigned int) si->nOutlines, nOut);
si->nOutlines = nOut;
}
return 0; /* internal error, already reported */
if (elem.str != NULL)
{
- WARN1("Assignment to field of unknown element in doodad %s\n",
+ WARN("Assignment to field of unknown element in doodad %s\n",
ddText(&new));
- ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+ ACTION("No value assigned to %s.%s\n", elem.str, field.str);
}
else if (!SetDoodadField(&new, field.str, ndx, var->value, si, info))
return False;
if ((def->nKeys < 1) && (warningLevel > 3))
{
- WARN2("Overlay \"%s\" in section \"%s\" has no keys\n",
+ WARN("Overlay \"%s\" in section \"%s\" has no keys\n",
XkbcAtomText(def->name), scText(si));
ACTION("Overlay ignored\n");
return True;
if ((!key) && warningLevel > 0)
{
WSGO("Couldn't allocate OverlayKeyInfo\n");
- ACTION2("Overlay %s for section %s will be incomplete\n",
- oiText(&ol), scText(si));
+ ACTION("Overlay %s for section %s will be incomplete\n",
+ XkbcAtomText(ol.name), scText(si));
return False;
}
strncpy(key->over, keyDef->over, XkbKeyNameLength);
else
{
ERROR("Illegal element used in a key definition\n");
- ACTION2("Assignment to %s.%s ignored\n", elem.str, f.str);
+ ACTION("Assignment to %s.%s ignored\n", elem.str, f.str);
return False;
}
}
break;
default:
ERROR("Cannot determine field for unnamed expression\n");
- ACTION3("Ignoring key %d in row %d of section %s\n",
+ ACTION("Ignoring key %d in row %d of section %s\n",
row->nKeys + 1, row->section->nRows + 1,
rowText(row));
return False;
if ((def->nKeys < 1) && (warningLevel > 3))
{
- ERROR1("Row in section %s has no keys\n", rowText(row));
+ ERROR("Row in section %s has no keys\n", rowText(row));
ACTION("Section ignored\n");
return True;
}
else
{
WARN("Assignment to field of unknown element in row\n");
- ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+ ACTION("No value assigned to %s.%s\n", elem.str, field.str);
}
}
else if (keyDef->common.stmtType == StmtKeyDef)
int len = strlen(keyDef->name);
if ((len < 1) || (len > XkbKeyNameLength))
{
- ERROR2("Illegal name %s for key in section %s\n",
+ ERROR("Illegal name %s for key in section %s\n",
keyDef->name, rowText(row));
ACTION("Section not compiled\n");
return False;
}
else
{
- WSGO1("Unexpected statement (type %d) in row body\n",
+ WSGO("Unexpected statement (type %d) in row body\n",
keyDef->common.stmtType);
return False;
}
else
{
WARN("Assignment to field of unknown element in section\n");
- ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+ ACTION("No value assigned to %s.%s\n", elem.str, field.str);
}
}
else if (rowDef->common.stmtType == StmtRowDef)
}
else
{
- WSGO1("Unexpected statement (type %d) in section body\n",
+ WSGO("Unexpected statement (type %d) in section body\n",
rowDef->common.stmtType);
return False;
}
}
if (si->nRows != def->nRows)
{
- WSGO2("Expected %d rows, found %d\n", (unsigned int) def->nRows,
+ WSGO("Expected %d rows, found %d\n", (unsigned int) def->nRows,
(unsigned int) si->nRows);
- ACTION1("Definition of section %s might be incorrect\n", scText(si));
+ ACTION("Definition of section %s might be incorrect\n", scText(si));
}
return True;
}
if (!failWhat)
failWhat = "key name";
ERROR("Interpretation files may not include other types\n");
- ACTION1("Ignoring %s definition.\n", failWhat);
+ ACTION("Ignoring %s definition.\n", failWhat);
info->errorCount++;
break;
default:
- WSGO1("Unexpected statement type %d in HandleGeometryFile\n",
+ WSGO("Unexpected statement type %d in HandleGeometryFile\n",
stmt->stmtType);
break;
}
#ifdef NOISY
ERROR("Too many errors\n");
#endif
- ACTION1("Abandoning geometry file \"%s\"\n", file->topName);
+ ACTION("Abandoning geometry file \"%s\"\n", file->topName);
break;
}
}
si->index = geom->num_shapes;
name = XkbcInternAtom(XkbcAtomGetString(si->name), False);
- shape = XkbAddGeomShape(geom, name, si->nOutlines);
+ shape = XkbcAddGeomShape(geom, name, si->nOutlines);
if (!shape)
{
WSGO("Couldn't allocate shape in geometry\n");
- ACTION1("Shape %s not compiled\n", shText(si));
+ ACTION("Shape %s not compiled\n", shText(si));
return False;
}
old_outline = si->outlines;
for (i = 0; i < si->nOutlines; i++, old_outline++)
{
- outline = XkbAddGeomOutline(shape, old_outline->num_points);
+ outline = XkbcAddGeomOutline(shape, old_outline->num_points);
if (!outline)
{
WSGO("Couldn't allocate outline in shape\n");
- ACTION1("Shape %s is incomplete\n", shText(si));
+ ACTION("Shape %s is incomplete\n", shText(si));
return False;
}
n = old_outline->num_points;
n = (si->primary - si->outlines);
shape->primary = &shape->outlines[n];
}
- XkbComputeShapeBounds(shape);
+ XkbcComputeShapeBounds(shape);
return True;
}
{
if (warningLevel < 9)
{
- ERROR1("No position defined for doodad %s\n",
+ ERROR("No position defined for doodad %s\n",
ddText(di));
ACTION("Illegal doodad ignored\n");
return False;
case XkbSolidDoodad:
if ((di->defs.defined & _GD_Shape) == 0)
{
- ERROR2("No shape defined for %s doodad %s\n",
+ ERROR("No shape defined for %s doodad %s\n",
(di->type == XkbOutlineDoodad ? "outline" : "filled"),
ddText(di));
ACTION("Incomplete definition ignored\n");
di->shape = si->name;
else
{
- ERROR1("No legal shape for %s\n", ddText(di));
+ ERROR("No legal shape for %s\n", ddText(di));
ACTION("Incomplete definition ignored\n");
return False;
}
{
if (warningLevel > 5)
{
- WARN1("No color for doodad %s\n", ddText(di));
+ WARN("No color for doodad %s\n", ddText(di));
ACTION("Using black\n");
}
di->color = XkbcInternAtom("black", False);
case XkbTextDoodad:
if ((di->defs.defined & _GD_Text) == 0)
{
- ERROR1("No text specified for text doodad %s\n", ddText(di));
+ ERROR("No text specified for text doodad %s\n", ddText(di));
ACTION("Illegal doodad definition ignored\n");
return False;
}
{
if (warningLevel > 5)
{
- WARN1("No color specified for doodad %s\n", ddText(di));
+ WARN("No color specified for doodad %s\n", ddText(di));
ACTION("Using black\n");
}
di->color = XkbcInternAtom("black", False);
return True;
if (warningLevel < 9)
{
- WARN1
+ WARN
("Text doodad %s has full and partial font definition\n",
ddText(di));
ACTION("Full specification ignored\n");
{
if (warningLevel > 5)
{
- WARN1("No font specified for doodad %s\n", ddText(di));
- ACTION1("Using \"%s\"\n", DFLT_FONT);
+ WARN("No font specified for doodad %s\n", ddText(di));
+ ACTION("Using \"%s\"\n", DFLT_FONT);
}
di->font = XkbcInternAtom(DFLT_FONT, False);
}
{
if (warningLevel > 7)
{
- WARN1("No font slant for text doodad %s\n", ddText(di));
- ACTION1("Using \"%s\"\n", DFLT_SLANT);
+ WARN("No font slant for text doodad %s\n", ddText(di));
+ ACTION("Using \"%s\"\n", DFLT_SLANT);
}
di->fontSlant = XkbcInternAtom(DFLT_SLANT, False);
}
{
if (warningLevel > 7)
{
- WARN1("No font weight for text doodad %s\n", ddText(di));
- ACTION1("Using \"%s\"\n", DFLT_WEIGHT);
+ WARN("No font weight for text doodad %s\n", ddText(di));
+ ACTION("Using \"%s\"\n", DFLT_WEIGHT);
}
di->fontWeight = XkbcInternAtom(DFLT_WEIGHT, False);
}
{
if (warningLevel > 9)
{
- WARN1("No font set width for text doodad %s\n", ddText(di));
- ACTION1("Using \"%s\"\n", DFLT_SET_WIDTH);
+ WARN("No font set width for text doodad %s\n", ddText(di));
+ ACTION("Using \"%s\"\n", DFLT_SET_WIDTH);
}
di->fontSetWidth = XkbcInternAtom(DFLT_SET_WIDTH, False);
}
{
if (warningLevel > 9)
{
- WARN1("No font variant for text doodad %s\n", ddText(di));
- ACTION1("Using \"%s\"\n", DFLT_VARIANT);
+ WARN("No font variant for text doodad %s\n", ddText(di));
+ ACTION("Using \"%s\"\n", DFLT_VARIANT);
}
di->fontVariant = XkbcInternAtom(DFLT_VARIANT, False);
}
{
if (warningLevel > 7)
{
- WARN1("No font encoding for doodad %s\n", ddText(di));
- ACTION1("Using \"%s\"\n", DFLT_ENCODING);
+ WARN("No font encoding for doodad %s\n", ddText(di));
+ ACTION("Using \"%s\"\n", DFLT_ENCODING);
}
di->fontEncoding = XkbcInternAtom(DFLT_ENCODING, False);
}
{
if (warningLevel > 7)
{
- WARN1("No font size for text doodad %s\n", ddText(di));
- ACTION1("Using %s point text\n", XkbcGeomFPText(DFLT_SIZE));
+ WARN("No font size for text doodad %s\n", ddText(di));
+ ACTION("Using %s point text\n", XkbcGeomFPText(DFLT_SIZE));
}
di->fontSize = DFLT_SIZE;
}
size *= nLines;
if (warningLevel > 5)
{
- WARN1("No height for text doodad %s\n", ddText(di));
- ACTION1("Using calculated height %s millimeters\n",
+ WARN("No height for text doodad %s\n", ddText(di));
+ ACTION("Using calculated height %s millimeters\n",
XkbcGeomFPText(size));
}
di->height = size;
width *= (di->height * 2) / 3;
if (warningLevel > 5)
{
- WARN1("No width for text doodad %s\n", ddText(di));
- ACTION1("Using calculated width %s millimeters\n",
+ WARN("No width for text doodad %s\n", ddText(di));
+ ACTION("Using calculated width %s millimeters\n",
XkbcGeomFPText(width));
}
di->width = width;
case XkbIndicatorDoodad:
if ((di->defs.defined & _GD_Shape) == 0)
{
- ERROR1("No shape defined for indicator doodad %s\n", ddText(di));
+ ERROR("No shape defined for indicator doodad %s\n", ddText(di));
ACTION("Incomplete definition ignored\n");
return False;
}
di->shape = si->name;
else
{
- ERROR1("No legal shape for doodad %s\n", ddText(di));
+ ERROR("No legal shape for doodad %s\n", ddText(di));
ACTION("Incomplete definition ignored\n");
return False;
}
{
if (warningLevel > 5)
{
- WARN1("No \"on\" color for indicator doodad %s\n",
+ WARN("No \"on\" color for indicator doodad %s\n",
ddText(di));
ACTION("Using green\n");
}
{
if (warningLevel > 5)
{
- WARN1("No \"off\" color for indicator doodad %s\n",
+ WARN("No \"off\" color for indicator doodad %s\n",
ddText(di));
ACTION("Using black\n");
}
case XkbLogoDoodad:
if (di->logoName == NULL)
{
- ERROR1("No logo name defined for logo doodad %s\n", ddText(di));
+ ERROR("No logo name defined for logo doodad %s\n", ddText(di));
ACTION("Incomplete definition ignored\n");
return False;
}
if ((di->defs.defined & _GD_Shape) == 0)
{
- ERROR1("No shape defined for logo doodad %s\n", ddText(di));
+ ERROR("No shape defined for logo doodad %s\n", ddText(di));
ACTION("Incomplete definition ignored\n");
return False;
}
di->shape = si->name;
else
{
- ERROR1("No legal shape for %s\n", ddText(di));
+ ERROR("No legal shape for %s\n", ddText(di));
ACTION("Incomplete definition ignored\n");
return False;
}
{
if (warningLevel > 5)
{
- WARN1("No color for doodad %s\n", ddText(di));
+ WARN("No color for doodad %s\n", ddText(di));
ACTION("Using black\n");
}
di->color = XkbcInternAtom("black", False);
}
break;
default:
- WSGO1("Uknown doodad type %d in VerifyDoodad\n",
+ WSGO("Uknown doodad type %d in VerifyDoodad\n",
(unsigned int) di->type);
return False;
}
if (!VerifyDoodadInfo(di, info))
return False;
name = XkbcInternAtom(XkbcAtomGetString(di->name), False);
- doodad = XkbAddGeomDoodad(geom, section, name);
+ doodad = XkbcAddGeomDoodad(geom, section, name);
if (!doodad)
{
- WSGO1("Couldn't allocate doodad in %s\n",
+ WSGO("Couldn't allocate doodad in %s\n",
(section ? "section" : "geometry"));
- ACTION1("Cannot copy doodad %s\n", ddText(di));
+ ACTION("Cannot copy doodad %s\n", ddText(di));
return False;
}
doodad->any.type = di->type;
return False;
doodad->shape.angle = di->angle;
color =
- XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
+ XkbcAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors);
shape = &geom->shapes[si->index];
XkbSetShapeDoodadColor(geom, &doodad->shape, color);
doodad->text.font = XkbcAtomGetString(di->fontSpec);
doodad->text.text = XkbcAtomGetString(di->text);
color =
- XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
+ XkbcAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors);
XkbSetTextDoodadColor(geom, &doodad->text, color);
break;
return False;
shape = &geom->shapes[si->index];
color =
- XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
+ XkbcAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors);
XkbSetIndicatorDoodadShape(geom, &doodad->indicator, shape);
XkbSetIndicatorDoodadOnColor(geom, &doodad->indicator, color);
color =
- XkbAddGeomColor(geom, XkbcAtomGetString(di->offColor),
+ XkbcAddGeomColor(geom, XkbcAtomGetString(di->offColor),
geom->num_colors);
XkbSetIndicatorDoodadOffColor(geom, &doodad->indicator, color);
break;
return False;
doodad->logo.angle = di->angle;
color =
- XkbAddGeomColor(geom, XkbcAtomGetString(di->color),
+ XkbcAddGeomColor(geom, XkbcAtomGetString(di->color),
geom->num_colors);
shape = &geom->shapes[si->index];
XkbSetLogoDoodadColor(geom, &doodad->logo, color);
{
if (warningLevel > 0)
{
- WARN3
+ WARN
("Key %s in section \"%s\" and overlay \"%s\"\n",
XkbcKeyNameText(key->name.name),
XkbcAtomText(section->name),
}
if ((ki->sectionRow == _GOK_UnknownRow) && (warningLevel > 0))
{
- WARN3
+ WARN
("Key %s not in \"%s\", but has an overlay key in \"%s\"\n",
XkbcKeyNameText(ki->under),
XkbcAtomText(section->name),
}
if (oi->nKeys < 1)
{
- ERROR2("Overlay \"%s\" for section \"%s\" has no legal keys\n",
+ ERROR("Overlay \"%s\" for section \"%s\" has no legal keys\n",
XkbcAtomText(oi->name), XkbcAtomText(section->name));
ACTION("Overlay definition ignored\n");
return False;
if (!VerifyOverlayInfo(geom, section, oi, info, rowMap, rowSize))
return False;
name = XkbcInternAtom(XkbcAtomGetString(oi->name), False);
- ol = XkbAddGeomOverlay(section, name, oi->nRows);
+ ol = XkbcAddGeomOverlay(section, name, oi->nRows);
if (!ol)
{
- WSGO2("Couldn't add overlay \"%s\" to section \"%s\"\n",
+ WSGO("Couldn't add overlay \"%s\" to section \"%s\"\n",
XkbcAtomText(name), XkbcAtomText(section->name));
return False;
}
if (rowMap[tmp] == i)
row_under = tmp;
}
- if (!XkbAddGeomOverlayRow(ol, row_under, rowSize[i]))
+ if (!XkbcAddGeomOverlayRow(ol, row_under, rowSize[i]))
{
- WSGO3
+ WSGO
("Can't add row %d to overlay \"%s\" of section \"%s\"\n",
i, XkbcAtomText(name), XkbcAtomText(section->name));
return False;
name = XkbcInternAtom(XkbcAtomGetString(si->name), False);
section =
- XkbAddGeomSection(geom, name, si->nRows, si->nDoodads, si->nOverlays);
+ XkbcAddGeomSection(geom, name, si->nRows, si->nDoodads, si->nOverlays);
if (section == NULL)
{
WSGO("Couldn't allocate section in geometry\n");
- ACTION1("Section %s not compiled\n", scText(si));
+ ACTION("Section %s not compiled\n", scText(si));
return False;
}
section->top = si->top;
section->priority = si->priority;
for (ri = si->rows; ri != NULL; ri = (RowInfo *) ri->defs.next)
{
- row = XkbAddGeomRow(section, ri->nKeys);
+ row = XkbcAddGeomRow(section, ri->nKeys);
if (row == NULL)
{
WSGO("Couldn't allocate row in section\n");
- ACTION1("Section %s is incomplete\n", scText(si));
+ ACTION("Section %s is incomplete\n", scText(si));
return False;
}
row->top = ri->top;
XkbColorPtr color;
if ((ki->defs.defined & _GK_Name) == 0)
{
- ERROR3("Key %d of row %d in section %s has no name\n",
+ ERROR("Key %d of row %d in section %s has no name\n",
(int) ki->index, (int) ri->index, scText(si));
- ACTION1("Section %s ignored\n", scText(si));
+ ACTION("Section %s ignored\n", scText(si));
return False;
}
- key = XkbAddGeomKey(row);
+ key = XkbcAddGeomKey(row);
if (key == NULL)
{
WSGO("Couldn't allocate key in row\n");
- ACTION1("Section %s is incomplete\n", scText(si));
+ ACTION("Section %s is incomplete\n", scText(si));
return False;
}
memcpy(key->name.name, ki->name, XkbKeyNameLength);
}
if (ki->color != None)
color =
- XkbAddGeomColor(geom,
+ XkbcAddGeomColor(geom,
XkbcAtomGetString(ki->color),
geom->num_colors);
else
- color = XkbAddGeomColor(geom, "white", geom->num_colors);
+ color = XkbcAddGeomColor(geom, "white", geom->num_colors);
XkbSetKeyColor(geom, key, color);
}
}
CopyOverlayDef(geom, section, oi, info);
}
}
- if (XkbComputeSectionBounds(geom, section))
+ if (XkbcComputeSectionBounds(geom, section))
{
/* 7/6/94 (ef) -- check for negative origin and translate */
if ((si->defs.defined & _GS_Width) == 0)
sizes.num_shapes = info.nShapes;
sizes.num_sections = info.nSections;
sizes.num_doodads = info.nDoodads;
- if (XkbAllocGeometry(xkb, &sizes) != Success)
+ if (XkbcAllocGeometry(xkb, &sizes) != Success)
{
WSGO("Couldn't allocate GeometryRec\n");
ACTION("Geometry not compiled\n");
if (info.name != NULL)
{
geom->name = XkbcInternAtom(info.name, False);
- if (XkbAllocNames(xkb, XkbGeometryNameMask, 0, 0) == Success)
+ if (XkbcAllocNames(xkb, XkbGeometryNameMask, 0, 0) == Success)
xkb->names->geometry = geom->name;
}
if (info.fontSpec != None)
info.fontVariant,
info.fontSize,
info.fontEncoding);
- XkbAddGeomColor(geom, "black", geom->num_colors);
- XkbAddGeomColor(geom, "white", geom->num_colors);
+ XkbcAddGeomColor(geom, "black", geom->num_colors);
+ XkbcAddGeomColor(geom, "white", geom->num_colors);
if (info.baseColor == None)
info.baseColor = XkbcInternAtom("white", False);
if (info.labelColor == None)
info.labelColor = XkbcInternAtom("black", False);
geom->base_color =
- XkbAddGeomColor(geom, XkbcAtomGetString(info.baseColor),
+ XkbcAddGeomColor(geom, XkbcAtomGetString(info.baseColor),
geom->num_colors);
geom->label_color =
- XkbAddGeomColor(geom, XkbcAtomGetString(info.labelColor),
+ XkbcAddGeomColor(geom, XkbcAtomGetString(info.labelColor),
geom->num_colors);
if (info.props)
for (pi = info.props; pi != NULL;
pi = (PropertyInfo *) pi->defs.next)
{
- if (!XkbAddGeomProperty(geom, pi->name, pi->value))
+ if (!XkbcAddGeomProperty(geom, pi->name, pi->value))
return False;
}
}
projects / platform / upstream / libxkbcommon.git / blobdiff