register int i, bit, nextFree;
ExprResult mod;
XkbcServerMapPtr srv;
- XkbNamesPtr names;
+ XkbcNamesPtr names;
srv = info->xkb->server;
names = info->xkb->names;
*/
int
LookupVModIndex(char * priv,
- Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
+ CARD32 elem, CARD32 field, unsigned type, ExprResult * val_rtrn)
{
int i;
XkbcDescPtr xkb;
*/
int
LookupVModMask(char * priv,
- Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
+ CARD32 elem, CARD32 field, unsigned type, ExprResult * val_rtrn)
{
if (LookupVModIndex(priv, elem, field, type, val_rtrn))
{
int
FindKeypadVMod(XkbcDescPtr xkb)
{
- Atom name;
+ CARD32 name;
ExprResult rtrn;
name = XkbcInternAtom("NumLock", False);
Bool
ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info)
{
- XkbNamesPtr names;
+ XkbcNamesPtr names;
names = info->xkb->names;
if (def->op == ExprIdent)