#define BAD_RESOURCE 0xe0000000
-static uint32_t lastAtom = None;
+static xkb_atom_t lastAtom = None;
static NodePtr atomRoot = NULL;
static unsigned long tableLength;
static NodePtr *nodeTable = NULL;
const char *
-XkbcAtomText(uint32_t atom)
+XkbcAtomText(xkb_atom_t atom)
{
NodePtr node;
}
char *
-XkbcAtomGetString(uint32_t atom)
+XkbcAtomGetString(xkb_atom_t atom)
{
const char *ret = XkbcAtomText(atom);
return ret ? strdup(ret) : NULL;
}
-uint32_t
+xkb_atom_t
xkb_intern_atom(const char *string)
{
NodePtr *np;
unsigned char fileID;
unsigned char merge;
unsigned char real_mods;
- uint32_t vmods;
+ xkb_atom_t vmods;
} GroupCompatInfo;
typedef struct _CompatInfo
/***====================================================================***/
typedef Bool(*IdentLookupFunc) (const void * /* priv */ ,
- uint32_t /* field */ ,
+ xkb_atom_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
}
static Bool
-SimpleLookup(const void * priv, uint32_t field, unsigned type,
+SimpleLookup(const void * priv, xkb_atom_t field, unsigned type,
ExprResult * val_rtrn)
{
const LookupEntry *entry;
}
static Bool
-RadioLookup(const void * priv, uint32_t field, unsigned type, ExprResult * val_rtrn)
+RadioLookup(const void * priv, xkb_atom_t field, unsigned type, ExprResult * val_rtrn)
{
const char *str;
int rg;
};
int
-LookupModIndex(const void * priv, uint32_t field, unsigned type,
+LookupModIndex(const void * priv, xkb_atom_t field, unsigned type,
ExprResult * val_rtrn)
{
return SimpleLookup(modIndexNames, field, type, val_rtrn);
}
int
-LookupModMask(const void * priv, uint32_t field, unsigned type,
+LookupModMask(const void * priv, xkb_atom_t field, unsigned type,
ExprResult * val_rtrn)
{
char *str;
);
extern int LookupModMask(const void * /* priv */ ,
- uint32_t /* field */ ,
+ xkb_atom_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
extern int LookupVModMask(const void * /* priv */ ,
- uint32_t /* field */ ,
+ xkb_atom_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
extern int LookupModIndex(const void * /* priv */ ,
- uint32_t /* field */ ,
+ xkb_atom_t /* field */ ,
unsigned /* type */ ,
ExprResult * /* val_rtrn */
);
typedef struct _LEDInfo
{
CommonInfo defs;
- uint32_t name;
+ xkb_atom_t name;
unsigned char indicator;
unsigned char flags;
unsigned char which_mods;
{
CommonInfo defs;
int ndx;
- uint32_t name;
+ xkb_atom_t name;
Bool virtual;
} IndicatorNameInfo;
}
static IndicatorNameInfo *
-FindIndicatorByName(KeyNamesInfo * info, uint32_t name)
+FindIndicatorByName(KeyNamesInfo * info, xkb_atom_t name)
{
IndicatorNameInfo *old;
else
{
const char *oldType, *newType;
- uint32_t using, ignoring;
+ xkb_atom_t using, ignoring;
if (old->virtual)
oldType = "virtual indicator";
else
typedef struct _KeyTypeInfo
{
CommonInfo defs;
- uint32_t name;
+ xkb_atom_t name;
int fileID;
unsigned mask;
unsigned vmask;
struct xkb_kt_map_entry * entries;
PreserveInfo *preserve;
int szNames;
- uint32_t *lvlNames;
+ xkb_atom_t *lvlNames;
} KeyTypeInfo;
typedef struct _KeyTypesInfo
VModInfo vmods;
} KeyTypesInfo;
-static uint32_t tok_ONE_LEVEL;
-static uint32_t tok_TWO_LEVEL;
-static uint32_t tok_ALPHABETIC;
-static uint32_t tok_KEYPAD;
+static xkb_atom_t tok_ONE_LEVEL;
+static xkb_atom_t tok_TWO_LEVEL;
+static xkb_atom_t tok_ALPHABETIC;
+static xkb_atom_t tok_KEYPAD;
/***====================================================================***/
}
if (from->dflt.lvlNames)
{
- info->dflt.lvlNames = uTypedCalloc(from->dflt.szNames, uint32_t);
+ info->dflt.lvlNames = uTypedCalloc(from->dflt.szNames, xkb_atom_t);
if (info->dflt.lvlNames)
{
- unsigned sz = from->dflt.szNames * sizeof(uint32_t);
+ unsigned sz = from->dflt.szNames * sizeof(xkb_atom_t);
memcpy(info->dflt.lvlNames, from->dflt.lvlNames, sz);
}
}
static Bool
AddLevelName(KeyTypeInfo * type,
- unsigned level, uint32_t name, Bool clobber, Bool report)
+ unsigned level, xkb_atom_t name, Bool clobber, Bool report)
{
if ((type->lvlNames == NULL) || (type->szNames <= level))
{
type->lvlNames =
- uTypedRecalloc(type->lvlNames, type->szNames, level + 1, uint32_t);
+ uTypedRecalloc(type->lvlNames, type->szNames, level + 1, xkb_atom_t);
if (type->lvlNames == NULL)
{
ERROR("Couldn't allocate level names for type %s\n",
{
ExprResult rtrn;
unsigned level;
- uint32_t level_name;
+ xkb_atom_t level_name;
if (arrayNdx == NULL)
return ReportTypeShouldBeArray(type, "level name");
typedef struct _KeyNameDesc
{
- uint32_t level1;
- uint32_t level2;
+ xkb_atom_t level1;
+ xkb_atom_t level2;
char name[5];
Bool used;
} KeyNameDesc;
}
VModDef *
-VModCreate(uint32_t name, ExprDef * value)
+VModCreate(xkb_atom_t name, ExprDef * value)
{
VModDef *def;
def = uTypedAlloc(VModDef);
}
VarDef *
-BoolVarCreate(uint32_t nameToken, unsigned set)
+BoolVarCreate(xkb_atom_t nameToken, unsigned set)
{
ExprDef *name, *value;
}
KeyTypeDef *
-KeyTypeCreate(uint32_t name, VarDef * body)
+KeyTypeCreate(xkb_atom_t name, VarDef * body)
{
KeyTypeDef *def;
}
IndicatorMapDef *
-IndicatorMapCreate(uint32_t name, VarDef * body)
+IndicatorMapCreate(xkb_atom_t name, VarDef * body)
{
IndicatorMapDef *def;
}
ExprDef *
-ActionCreate(uint32_t name, ExprDef * args)
+ActionCreate(xkb_atom_t name, ExprDef * args)
{
ExprDef *act;
}
ShapeDef *
-ShapeDeclCreate(uint32_t name, OutlineDef * outlines)
+ShapeDeclCreate(xkb_atom_t name, OutlineDef * outlines)
{
ShapeDef *shape;
OutlineDef *ol;
}
OutlineDef *
-OutlineCreate(uint32_t field, ExprDef * points)
+OutlineCreate(xkb_atom_t field, ExprDef * points)
{
OutlineDef *outline;
ExprDef *pt;
}
SectionDef *
-SectionDeclCreate(uint32_t name, RowDef * rows)
+SectionDeclCreate(xkb_atom_t name, RowDef * rows)
{
SectionDef *section;
RowDef *row;
}
OverlayDef *
-OverlayDeclCreate(uint32_t name, OverlayKeyDef * keys)
+OverlayDeclCreate(xkb_atom_t name, OverlayKeyDef * keys)
{
OverlayDef *ol;
OverlayKeyDef *key;
}
DoodadDef *
-DoodadCreate(unsigned type, uint32_t name, VarDef * body)
+DoodadCreate(unsigned type, xkb_atom_t name, VarDef * body)
{
DoodadDef *doodad;
char * /* real */
);
-extern VModDef *VModCreate(uint32_t /* name */ ,
+extern VModDef *VModCreate(xkb_atom_t /* name */ ,
ExprDef * /* value */
);
ExprDef * /* value */
);
-extern VarDef *BoolVarCreate(uint32_t /* nameToken */ ,
+extern VarDef *BoolVarCreate(xkb_atom_t /* nameToken */ ,
unsigned /* set */
);
ExprDef * /* match */
);
-extern KeyTypeDef *KeyTypeCreate(uint32_t /* name */ ,
+extern KeyTypeDef *KeyTypeCreate(xkb_atom_t /* name */ ,
VarDef * /* body */
);
ExprDef * /* keys */
);
-extern IndicatorMapDef *IndicatorMapCreate(uint32_t /* name */ ,
+extern IndicatorMapDef *IndicatorMapCreate(xkb_atom_t /* name */ ,
VarDef * /* body */
);
Bool /* virtual */
);
-extern ExprDef *ActionCreate(uint32_t /* name */ ,
+extern ExprDef *ActionCreate(xkb_atom_t /* name */ ,
ExprDef * /* args */
);
extern ExprDef *CreateKeysymList(char * /* sym */
);
-extern ShapeDef *ShapeDeclCreate(uint32_t /* name */ ,
+extern ShapeDef *ShapeDeclCreate(xkb_atom_t /* name */ ,
OutlineDef * /* outlines */
);
-extern OutlineDef *OutlineCreate(uint32_t /* field */ ,
+extern OutlineDef *OutlineCreate(xkb_atom_t /* field */ ,
ExprDef * /* points */
);
extern RowDef *RowDeclCreate(KeyDef * /* keys */
);
-extern SectionDef *SectionDeclCreate(uint32_t /* name */ ,
+extern SectionDef *SectionDeclCreate(xkb_atom_t /* name */ ,
RowDef * /* rows */
);
char * /* over */
);
-extern OverlayDef *OverlayDeclCreate(uint32_t /* name */ ,
+extern OverlayDef *OverlayDeclCreate(xkb_atom_t /* name */ ,
OverlayKeyDef * /* rows */
);
extern DoodadDef *DoodadCreate(unsigned /* type */ ,
- uint32_t /* name */ ,
+ xkb_atom_t /* name */ ,
VarDef * /* body */
);
short numLevels[XkbNumKbdGroups];
xkb_keysym_t *syms[XkbNumKbdGroups];
union xkb_action *acts[XkbNumKbdGroups];
- uint32_t types[XkbNumKbdGroups];
+ xkb_atom_t types[XkbNumKbdGroups];
unsigned repeat;
struct xkb_behavior behavior;
unsigned short vmodmap;
unsigned long nameForOverlayKey;
unsigned long allowNone;
- uint32_t dfltType;
+ xkb_atom_t dfltType;
} KeyInfo;
/**
KeyInfo dflt;
VModInfo vmods;
ActionInfo *action;
- uint32_t groupNames[XkbNumKbdGroups];
+ xkb_atom_t groupNames[XkbNumKbdGroups];
ModMapEntry *modMap;
AliasInfo *aliases;
if ((into->types[i] != None) && (report) &&
(into->types[i] != from->types[i]))
{
- uint32_t use, ignore;
+ xkb_atom_t use, ignore;
collide |= _Key_Types;
if (from->defs.merge != MergeAugment)
{
* @return True if found, False otherwise.
*/
static Bool
-FindNamedType(struct xkb_desc * xkb, uint32_t atom, unsigned *type_rtrn)
+FindNamedType(struct xkb_desc * xkb, xkb_atom_t atom, unsigned *type_rtrn)
{
unsigned n;
const char *name = XkbcAtomText(atom);
* undefined.
*/
static int
-LookupVModIndex(const struct xkb_desc *xkb, uint32_t field, unsigned type,
+LookupVModIndex(const struct xkb_desc *xkb, xkb_atom_t field, unsigned type,
ExprResult * val_rtrn)
{
int i;
* undefined.
*/
int
-LookupVModMask(const void * priv, uint32_t field, unsigned type,
+LookupVModMask(const void * priv, xkb_atom_t field, unsigned type,
ExprResult * val_rtrn)
{
if (LookupModMask(NULL, field, type, val_rtrn))
int
FindKeypadVMod(struct xkb_desc * xkb)
{
- uint32_t name;
+ xkb_atom_t name;
ExprResult rtrn;
name = xkb_intern_atom("NumLock");
#include "xkbcommon/xkbcommon.h"
#include "XKBcommonint.h"
+#include "xkbmisc.h"
extern char *scanFile;
} binary;
struct
{
- uint32_t element;
- uint32_t field;
+ xkb_atom_t element;
+ xkb_atom_t field;
} field;
struct
{
- uint32_t element;
- uint32_t field;
+ xkb_atom_t element;
+ xkb_atom_t field;
struct _Expr *entry;
} array;
struct
{
- uint32_t name;
+ xkb_atom_t name;
struct _Expr *args;
} action;
struct
int y;
} coord;
struct _Expr *child;
- uint32_t str;
+ xkb_atom_t str;
unsigned uval;
int ival;
char keyName[5];
{
ParseCommon common;
unsigned merge;
- uint32_t name;
+ xkb_atom_t name;
ExprDef *value;
} VModDef;
{
ParseCommon common;
unsigned merge;
- uint32_t name;
+ xkb_atom_t name;
VarDef *body;
} KeyTypeDef;
{
ParseCommon common;
unsigned merge;
- uint32_t modifier;
+ xkb_atom_t modifier;
ExprDef *keys;
} ModMapDef;
typedef struct _OutlineDef
{
ParseCommon common;
- uint32_t field;
+ xkb_atom_t field;
int nPoints;
ExprDef *points;
} OutlineDef;
{
ParseCommon common;
unsigned merge;
- uint32_t name;
+ xkb_atom_t name;
int nOutlines;
OutlineDef *outlines;
} ShapeDef;
{
ParseCommon common;
unsigned merge;
- uint32_t name;
+ xkb_atom_t name;
int nRows;
RowDef *rows;
} SectionDef;
{
ParseCommon common;
unsigned merge;
- uint32_t name;
+ xkb_atom_t name;
int nKeys;
OverlayKeyDef *keys;
} OverlayDef;
ParseCommon common;
unsigned merge;
unsigned type;
- uint32_t name;
+ xkb_atom_t name;
VarDef *body;
} DoodadDef;
#include <X11/Xdefs.h>
#include "xkbcommon/xkbcommon.h"
+typedef uint32_t xkb_atom_t;
+
/***====================================================================***/
extern Bool
/***====================================================================***/
-extern uint32_t
+extern xkb_atom_t
xkb_intern_atom(const char *string);
extern char *
-XkbcAtomGetString(uint32_t atom);
+XkbcAtomGetString(xkb_atom_t atom);
extern void
XkbcFreeAllAtoms(void);
/***====================================================================***/
extern const char *
-XkbcAtomText(uint32_t atm);
+XkbcAtomText(xkb_atom_t atm);
extern const char *
XkbcVModMaskText(struct xkb_desc * xkb, unsigned modMask, unsigned mask);