return ReportIllegal(action->type, field);
}
-static LookupEntry btnNames[] = {
- {"button1", 1},
- {"button2", 2},
- {"button3", 3},
- {"button4", 4},
- {"button5", 5},
- {"default", 0},
- {NULL, 0}
-};
-
static LookupEntry lockWhich[] = {
{"both", 0},
{"lock", XkbSA_LockNoUnlock},
{
if (array_ndx != NULL)
return ReportActionNotArray(action->type, field);
- if (!ExprResolveInteger
- (value, &rtrn, SimpleLookup, (char *) btnNames))
+ if (!ExprResolveButton(value, &rtrn))
return ReportMismatch(action->type, field,
"integer (range 1..5)");
if ((rtrn.ival < 0) || (rtrn.ival > 5))
{
if (array_ndx != NULL)
return ReportActionNotArray(action->type, field);
- if (!ExprResolveInteger
- (value, &rtrn, SimpleLookup, (char *) btnNames))
+ if (!ExprResolveButton(value, &rtrn))
return ReportMismatch(action->type, field, "integer");
if ((rtrn.ival < 0) || (rtrn.ival > 255))
{
btn = value;
}
- if (!ExprResolveInteger
- (btn, &rtrn, SimpleLookup, (char *) btnNames))
+ if (!ExprResolveButton(btn, &rtrn))
return ReportMismatch(action->type, field,
"integer (range 1..5)");
if ((rtrn.ival < 0) || (rtrn.ival > 5))
{
if (array_ndx != NULL)
return ReportActionNotArray(action->type, field);
- if (!ExprResolveInteger
- (value, &rtrn, SimpleLookup, (char *) btnNames))
+ if (!ExprResolveButton(value, &rtrn))
return ReportMismatch(action->type, field, "integer");
if ((rtrn.ival < 0) || (rtrn.ival > 255))
{
}
int
+ExprResolveButton(ExprDef * expr,
+ ExprResult * val_rtrn)
+{
+ static LookupEntry button_names[] = {
+ { "button1", 1 },
+ { "button2", 2 },
+ { "button3", 3 },
+ { "button4", 4 },
+ { "button5", 5 },
+ { "default", 0 },
+ { NULL, 0 }
+ };
+
+ return ExprResolveInteger(expr, val_rtrn, SimpleLookup,
+ (char *) button_names);
+}
+
+int
ExprResolveString(ExprDef * expr,
ExprResult * val_rtrn)
{