ReportMismatch(unsigned action, unsigned field, const char *type)
{
ERROR2("Value of %s field must be of type %s\n", fieldText(field), type);
- ACTION1("Action %s definition ignored\n",
- XkbActionTypeText(action, XkbMessage));
+ ACTION1("Action %s definition ignored\n", XkbActionTypeText(action));
return False;
}
ReportIllegal(unsigned action, unsigned field)
{
ERROR2("Field %s is not defined for an action of type %s\n",
- fieldText(field), XkbActionTypeText(action, XkbMessage));
+ fieldText(field), XkbActionTypeText(action));
ACTION("Action definition ignored\n");
return False;
}
ReportActionNotArray(unsigned action, unsigned field)
{
ERROR2("The %s field in the %s action is not an array\n",
- fieldText(field), XkbActionTypeText(action, XkbMessage));
+ fieldText(field), XkbActionTypeText(action));
ACTION("Action definition ignored\n");
return False;
}
{
ERROR2("%s named %s not found\n", what, bad);
ACTION2("Ignoring the %s field of an %s action\n", fieldText(field),
- XkbActionTypeText(action, XkbMessage));
+ XkbActionTypeText(action));
return False;
}
{
ERROR2("Illegal group %d (must be in the range 1..%d)\n", rtrn.ival,
XkbNumKbdGroups);
- ACTION1("Action %s definition ignored\n",
- XkbActionTypeText(action, XkbMessage));
+ ACTION1("Action %s definition ignored\n", XkbActionTypeText(action));
return False;
}
if (value->op == OpNegate)
break;
default:
ERROR1("Cannot compile %s alone into an XKM file\n",
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(mainType));
return False;
}
have = 0;
if ((have & (1 << file->type)) != 0)
{
ERROR2("More than one %s section in a %s file\n",
- XkbConfigText(file->type, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(file->type), XkbConfigText(mainType));
ACTION("All sections after the first ignored\n");
ok = False;
}
else if ((1 << file->type) & (~legal))
{
ERROR2("Cannot define %s in a %s file\n",
- XkbConfigText(file->type, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(file->type), XkbConfigText(mainType));
ok = False;
}
else
case XkmLayoutFile:
case XkmKeymapFile:
WSGO2("Illegal %s configuration in a %s file\n",
- XkbConfigText(file->type, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(file->type), XkbConfigText(mainType));
ACTION("Ignored\n");
ok = False;
break;
case XkmVirtualModsIndex:
case XkmIndicatorsIndex:
WSGO1("Found an isolated %s section\n",
- XkbConfigText(file->type, XkbMessage));
+ XkbConfigText(file->type));
break;
default:
WSGO1("Unknown file type %d\n", file->type);
if (missing & bit)
{
ERROR2("Missing %s section in a %s file\n",
- XkbConfigText(i, XkbMessage),
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(i), XkbConfigText(mainType));
missing &= ~bit;
}
}
ACTION1("Description of %s not compiled\n",
- XkbConfigText(mainType, XkbMessage));
+ XkbConfigText(mainType));
ok = False;
}
ok = BindIndicators(xkb, True, unbound, NULL);
if (!mapToUse)
{
ERROR3("No %s named \"%s\" in the include file \"%s\"\n",
- XkbConfigText(file_type, XkbMessage), stmt->map,
- stmt->file);
+ XkbConfigText(file_type), stmt->map, stmt->file);
ACTION("Exiting\n");
return False;
}
if (mapToUse->type != file_type)
{
ERROR2("Include file wrong type (expected %s, got %s)\n",
- XkbConfigText(file_type, XkbMessage),
- XkbConfigText(mapToUse->type, XkbMessage));
+ XkbConfigText(file_type), XkbConfigText(mapToUse->type));
ACTION1("Include file \"%s\" ignored\n", stmt->file);
return False;
}
}
char *
-XkbConfigText(unsigned config, unsigned format)
+XkbConfigText(unsigned config)
{
switch (config) {
case XkmSemanticsFile:
};
char *
-XkbActionTypeText(unsigned type, unsigned format)
+XkbActionTypeText(unsigned type)
{
if (type <= XkbSA_LastAction)
);
extern char *
-XkbConfigText(unsigned config, unsigned format);
+XkbConfigText(unsigned config);
extern char *
-XkbActionTypeText(unsigned type, unsigned format);
+XkbActionTypeText(unsigned type);
#endif /* MISC_H */
("Multiple actions for level %d/group %d on key %s\n",
i + 1, group + 1, longText(into->name, XkbMessage));
ACTION2("Using %s, ignoring %s\n",
- XkbActionTypeText(use->type, XkbMessage),
- XkbActionTypeText(ignore->type, XkbMessage));
+ XkbActionTypeText(use->type),
+ XkbActionTypeText(ignore->type));
}
resultActs[i] = *use;
}