}
static Bool
-HandleNoAction(XkbDescPtr xkb,
+HandleNoAction(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-CheckModifierField(XkbDescPtr xkb,
+CheckModifierField(XkbcDescPtr xkb,
unsigned action,
ExprDef * value,
unsigned *flags_inout, unsigned *mods_rtrn)
}
static Bool
-HandleSetLatchMods(XkbDescPtr xkb,
+HandleSetLatchMods(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleLockMods(XkbDescPtr xkb,
+HandleLockMods(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleSetLatchGroup(XkbDescPtr xkb,
+HandleSetLatchGroup(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleLockGroup(XkbDescPtr xkb,
+HandleLockGroup(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleMovePtr(XkbDescPtr xkb,
+HandleMovePtr(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandlePtrBtn(XkbDescPtr xkb,
+HandlePtrBtn(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleSetPtrDflt(XkbDescPtr xkb,
+HandleSetPtrDflt(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleISOLock(XkbDescPtr xkb,
+HandleISOLock(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleSwitchScreen(XkbDescPtr xkb,
+HandleSwitchScreen(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleSetLockControls(XkbDescPtr xkb,
+HandleSetLockControls(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleActionMessage(XkbDescPtr xkb,
+HandleActionMessage(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleRedirectKey(XkbDescPtr xkb,
+HandleRedirectKey(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleDeviceBtn(XkbDescPtr xkb,
+HandleDeviceBtn(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleDeviceValuator(XkbDescPtr xkb,
+HandleDeviceValuator(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandlePrivate(XkbDescPtr xkb,
+HandlePrivate(XkbcDescPtr xkb,
XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
return ReportIllegal(PrivateAction, field);
}
-typedef Bool(*actionHandler) (XkbDescPtr /* xkb */ ,
+typedef Bool(*actionHandler) (XkbcDescPtr /* xkb */ ,
XkbAnyAction * /* action */ ,
unsigned /* field */ ,
ExprDef * /* array_ndx */ ,
int
HandleActionDef(ExprDef * def,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
XkbAnyAction * action, unsigned mergeMode, ActionInfo * info)
{
ExprDef *arg;
/***====================================================================***/
int
-SetActionField(XkbDescPtr xkb,
+SetActionField(XkbcDescPtr xkb,
char *elem,
char *field,
ExprDef * array_ndx, ExprDef * value, ActionInfo ** info_rtrn)
} ActionInfo;
extern int HandleActionDef(ExprDef * /* def */ ,
- XkbDescPtr /* xkb */ ,
+ XkbcDescPtr /* xkb */ ,
XkbAnyAction * /* action */ ,
unsigned /* mergeMode */ ,
ActionInfo * /* info */
);
-extern int SetActionField(XkbDescPtr /* xkb */ ,
+extern int SetActionField(XkbcDescPtr /* xkb */ ,
char * /* elem */ ,
char * /* field */ ,
ExprDef * /* index */ ,
}
int
-ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
+ApplyAliases(XkbcDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
{
register int i;
XkbKeyAliasPtr old, a;
unsigned /* how_merge */
);
-extern int ApplyAliases(XkbDescPtr /* xkb */ ,
+extern int ApplyAliases(XkbcDescPtr /* xkb */ ,
Bool /* toGeom */ ,
AliasInfo ** /* info */
);
LEDInfo *leds;
VModInfo vmods;
ActionInfo *act;
- XkbDescPtr xkb;
+ XkbcDescPtr xkb;
} CompatInfo;
/***====================================================================***/
}
static void
-InitCompatInfo(CompatInfo * info, XkbDescPtr xkb)
+InitCompatInfo(CompatInfo * info, XkbcDescPtr xkb)
{
register int i;
}
static void
-ClearCompatInfo(CompatInfo * info, XkbDescPtr xkb)
+ClearCompatInfo(CompatInfo * info, XkbcDescPtr xkb)
{
register int i;
}
typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
- XkbDescPtr /* xkb */ ,
+ XkbcDescPtr /* xkb */ ,
unsigned /* merge */ ,
CompatInfo * /* info */
);
static Bool
HandleIncludeCompatMap(IncludeStmt * stmt,
- XkbDescPtr xkb, CompatInfo * info, FileHandler hndlr)
+ XkbcDescPtr xkb, CompatInfo * info, FileHandler hndlr)
{
unsigned newMerge;
XkbFile *rtrn;
static int
SetInterpField(SymInterpInfo * si,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, CompatInfo * info)
{
};
static int
-HandleInterpVar(VarDef * stmt, XkbDescPtr xkb, CompatInfo * info)
+HandleInterpVar(VarDef * stmt, XkbcDescPtr xkb, CompatInfo * info)
{
ExprResult elem, field;
ExprDef *ndx;
}
static int
-HandleInterpBody(VarDef * def, XkbDescPtr xkb, SymInterpInfo * si,
+HandleInterpBody(VarDef * def, XkbcDescPtr xkb, SymInterpInfo * si,
CompatInfo * info)
{
int ok = 1;
}
static int
-HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge,
+HandleInterpDef(InterpDef * def, XkbcDescPtr xkb, unsigned merge,
CompatInfo * info)
{
unsigned pred, mods;
static int
HandleGroupCompatDef(GroupCompatDef * def,
- XkbDescPtr xkb, unsigned merge, CompatInfo * info)
+ XkbcDescPtr xkb, unsigned merge, CompatInfo * info)
{
ExprResult val;
GroupCompatInfo tmp;
static void
HandleCompatMapFile(XkbFile * file,
- XkbDescPtr xkb, unsigned merge, CompatInfo * info)
+ XkbcDescPtr xkb, unsigned merge, CompatInfo * info)
{
ParseCommon *stmt;
}
typedef void (*FileHandler) (XkbFile * /* file */ ,
- XkbDescPtr /* xkb */ ,
+ XkbcDescPtr /* xkb */ ,
unsigned /* merge */ ,
GeometryInfo * /* info */
);
static Bool
-HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr xkb, GeometryInfo * info,
+HandleIncludeGeometry(IncludeStmt * stmt, XkbcDescPtr xkb, GeometryInfo * info,
FileHandler hndlr)
{
unsigned newMerge;
}
static int
-HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
+HandleGeometryVar(VarDef * stmt, XkbcDescPtr xkb, GeometryInfo * info)
{
ExprResult elem, field, tmp;
ExprDef *ndx;
}
static int
-HandleShapeDef(ShapeDef * def, XkbDescPtr xkb, unsigned merge,
+HandleShapeDef(ShapeDef * def, XkbcDescPtr xkb, unsigned merge,
GeometryInfo * info)
{
ShapeInfo si;
static int
HandleSectionDef(SectionDef * def,
- XkbDescPtr xkb, unsigned merge, GeometryInfo * info)
+ XkbcDescPtr xkb, unsigned merge, GeometryInfo * info)
{
SectionInfo si;
char *str;
static void
HandleGeometryFile(XkbFile * file,
- XkbDescPtr xkb, unsigned merge, GeometryInfo * info)
+ XkbcDescPtr xkb, unsigned merge, GeometryInfo * info)
{
ParseCommon *stmt;
char *failWhat;
int
SetIndicatorMapField(LEDInfo * led,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
char *field, ExprDef * arrayNdx, ExprDef * value)
{
ExprResult rtrn;
LEDInfo *
HandleIndicatorMapDef(IndicatorMapDef * def,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
LEDInfo * dflt, LEDInfo * oldLEDs, unsigned merge)
{
LEDInfo led, *rtrn;
);
extern int SetIndicatorMapField(LEDInfo * /* led */ ,
- XkbDescPtr /* xkb */ ,
+ XkbcDescPtr /* xkb */ ,
char * /* field */ ,
ExprDef * /* arrayNdx */ ,
ExprDef * /* value */
);
extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ ,
- XkbDescPtr /* xkb */ ,
+ XkbcDescPtr /* xkb */ ,
LEDInfo * /* dflt */ ,
LEDInfo * /* oldLEDs */ ,
unsigned /* mergeMode */
} KeyNamesInfo;
static void HandleKeycodesFile(XkbFile * file,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
unsigned merge,
KeyNamesInfo * info);
* @param info Struct to store the key info in.
*/
static Bool
-HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr xkb, KeyNamesInfo * info)
+HandleIncludeKeycodes(IncludeStmt * stmt, XkbcDescPtr xkb, KeyNamesInfo * info)
{
unsigned newMerge;
XkbFile *rtrn;
*/
static void
HandleKeycodesFile(XkbFile * file,
- XkbDescPtr xkb, unsigned merge, KeyNamesInfo * info)
+ XkbcDescPtr xkb, unsigned merge, KeyNamesInfo * info)
{
ParseCommon *stmt;
/***====================================================================***/
-extern Bool AddMapEntry(XkbDescPtr /* xkb */ ,
+extern Bool AddMapEntry(XkbcDescPtr /* xkb */ ,
KeyTypeInfo * /* type */ ,
XkbKTMapEntryPtr /* new */ ,
Bool /* clobber */ ,
Bool /* report */
);
-extern Bool AddPreserve(XkbDescPtr /* xkb */ ,
+extern Bool AddPreserve(XkbcDescPtr /* xkb */ ,
KeyTypeInfo * /* type */ ,
PreserveInfo * /* new */ ,
Bool /* clobber */ ,
/***====================================================================***/
static void
-InitKeyTypesInfo(KeyTypesInfo * info, XkbDescPtr xkb, KeyTypesInfo * from)
+InitKeyTypesInfo(KeyTypesInfo * info, XkbcDescPtr xkb, KeyTypesInfo * from)
{
tok_ONE_LEVEL = XkbInternAtom(NULL, "ONE_LEVEL", False);
tok_TWO_LEVEL = XkbInternAtom(NULL, "TWO_LEVEL", False);
}
static Bool
-AddKeyType(XkbDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
+AddKeyType(XkbcDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
{
KeyTypeInfo *old;
static void
MergeIncludedKeyTypes(KeyTypesInfo * into,
- KeyTypesInfo * from, unsigned merge, XkbDescPtr xkb)
+ KeyTypesInfo * from, unsigned merge, XkbcDescPtr xkb)
{
KeyTypeInfo *type;
}
typedef void (*FileHandler) (XkbFile * /* file */ ,
- XkbDescPtr /* xkb */ ,
+ XkbcDescPtr /* xkb */ ,
unsigned /* merge */ ,
KeyTypesInfo * /* included */
);
static Bool
HandleIncludeKeyTypes(IncludeStmt * stmt,
- XkbDescPtr xkb, KeyTypesInfo * info, FileHandler hndlr)
+ XkbcDescPtr xkb, KeyTypesInfo * info, FileHandler hndlr)
{
unsigned newMerge;
XkbFile *rtrn;
}
Bool
-AddPreserve(XkbDescPtr xkb,
+AddPreserve(XkbcDescPtr xkb,
KeyTypeInfo * type, PreserveInfo * new, Bool clobber, Bool report)
{
PreserveInfo *old;
* @param report True if a warning is to be printed on.
*/
Bool
-AddMapEntry(XkbDescPtr xkb,
+AddMapEntry(XkbcDescPtr xkb,
KeyTypeInfo * type,
XkbKTMapEntryPtr new, Bool clobber, Bool report)
{
static Bool
SetMapEntry(KeyTypeInfo * type,
- XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value)
+ XkbcDescPtr xkb, ExprDef * arrayNdx, ExprDef * value)
{
ExprResult rtrn;
XkbKTMapEntryRec entry;
static Bool
SetPreserve(KeyTypeInfo * type,
- XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value)
+ XkbcDescPtr xkb, ExprDef * arrayNdx, ExprDef * value)
{
ExprResult rtrn;
PreserveInfo new;
*/
static Bool
SetKeyTypeField(KeyTypeInfo * type,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, KeyTypesInfo * info)
{
}
static Bool
-HandleKeyTypeVar(VarDef * stmt, XkbDescPtr xkb, KeyTypesInfo * info)
+HandleKeyTypeVar(VarDef * stmt, XkbcDescPtr xkb, KeyTypesInfo * info)
{
ExprResult elem, field;
ExprDef *arrayNdx;
static int
HandleKeyTypeBody(VarDef * def,
- XkbDescPtr xkb, KeyTypeInfo * type, KeyTypesInfo * info)
+ XkbcDescPtr xkb, KeyTypeInfo * type, KeyTypesInfo * info)
{
int ok = 1;
ExprResult tmp, field;
*/
static int
HandleKeyTypeDef(KeyTypeDef * def,
- XkbDescPtr xkb, unsigned merge, KeyTypesInfo * info)
+ XkbcDescPtr xkb, unsigned merge, KeyTypesInfo * info)
{
register int i;
KeyTypeInfo type;
*/
static void
HandleKeyTypesFile(XkbFile * file,
- XkbDescPtr xkb, unsigned merge, KeyTypesInfo * info)
+ XkbcDescPtr xkb, unsigned merge, KeyTypesInfo * info)
{
ParseCommon *stmt;
}
static Bool
-CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def)
+CopyDefToKeyType(XkbcDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def)
{
register int i;
PreserveInfo *pre;
};
Status
-ComputeKbdDefaults(XkbDescPtr xkb)
+ComputeKbdDefaults(XkbcDescPtr xkb)
{
Status rtrn;
register int i, tmp, nUnknown;
* @return True if found, False otherwise.
*/
Bool
-FindNamedKey(XkbDescPtr xkb,
+FindNamedKey(XkbcDescPtr xkb,
unsigned long name,
unsigned int *kc_rtrn,
Bool use_aliases, Bool create, int start_from)
}
Bool
-FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lname,
+FindKeyNameForAlias(XkbcDescPtr xkb, unsigned long lname,
unsigned long *real_name)
{
register int i;
unsigned * /* merge_rtrn */
);
-extern Status ComputeKbdDefaults(XkbDescPtr /* xkb */
+extern Status ComputeKbdDefaults(XkbcDescPtr /* xkb */
);
-extern Bool FindNamedKey(XkbDescPtr /* xkb */ ,
+extern Bool FindNamedKey(XkbcDescPtr /* xkb */ ,
unsigned long /* name */ ,
unsigned int * /* kc_rtrn */ ,
Bool /* use_aliases */ ,
int /* start_from */
);
-extern Bool FindKeyNameForAlias(XkbDescPtr /* xkb */ ,
+extern Bool FindKeyNameForAlias(XkbcDescPtr /* xkb */ ,
unsigned long /* lname */ ,
unsigned long * /* real_name */
);
} SymbolsInfo;
static void
-InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb)
+InitSymbolsInfo(SymbolsInfo * info, XkbcDescPtr xkb)
{
register int i;
}
static Bool
-AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDescPtr xkb)
+AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbcDescPtr xkb)
{
register int i;
unsigned long real_name;
static void
MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
- unsigned merge, XkbDescPtr xkb)
+ unsigned merge, XkbcDescPtr xkb)
{
register int i;
KeyInfo *key;
}
typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
- XkbDescPtr /* xkb */ ,
+ XkbcDescPtr /* xkb */ ,
unsigned /* merge */ ,
SymbolsInfo * /* included */
);
static Bool
HandleIncludeSymbols(IncludeStmt * stmt,
- XkbDescPtr xkb, SymbolsInfo * info, FileHandler hndlr)
+ XkbcDescPtr xkb, SymbolsInfo * info, FileHandler hndlr)
{
unsigned newMerge;
XkbFile *rtrn;
static Bool
AddSymbolsToKey(KeyInfo * key,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{
static Bool
AddActionsToKey(KeyInfo * key,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{
static Bool
SetSymbolsField(KeyInfo * key,
- XkbDescPtr xkb,
+ XkbcDescPtr xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{
}
static int
-HandleSymbolsVar(VarDef * stmt, XkbDescPtr xkb, SymbolsInfo * info)
+HandleSymbolsVar(VarDef * stmt, XkbcDescPtr xkb, SymbolsInfo * info)
{
ExprResult elem, field, tmp;
ExprDef *arrayNdx;
static Bool
HandleSymbolsBody(VarDef * def,
- XkbDescPtr xkb, KeyInfo * key, SymbolsInfo * info)
+ XkbcDescPtr xkb, KeyInfo * key, SymbolsInfo * info)
{
Bool ok = True;
ExprResult tmp, field;
static int
HandleSymbolsDef(SymbolsDef * stmt,
- XkbDescPtr xkb, unsigned merge, SymbolsInfo * info)
+ XkbcDescPtr xkb, unsigned merge, SymbolsInfo * info)
{
KeyInfo key;
static Bool
HandleModMapDef(ModMapDef * def,
- XkbDescPtr xkb, unsigned merge, SymbolsInfo * info)
+ XkbcDescPtr xkb, unsigned merge, SymbolsInfo * info)
{
ExprDef *key;
ModMapEntry tmp;
static void
HandleSymbolsFile(XkbFile * file,
- XkbDescPtr xkb, unsigned merge, SymbolsInfo * info)
+ XkbcDescPtr xkb, unsigned merge, SymbolsInfo * info)
{
ParseCommon *stmt;
}
static Bool
-FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned int *kc_rtrn)
+FindKeyForSymbol(XkbcDescPtr xkb, KeySym sym, unsigned int *kc_rtrn)
{
register int i, j;
register Bool gotOne;
* @return True if found, False otherwise.
*/
static Bool
-FindNamedType(XkbDescPtr xkb, Atom name, unsigned *type_rtrn)
+FindNamedType(XkbcDescPtr xkb, Atom name, unsigned *type_rtrn)
{
register unsigned n;
#include "vmod.h"
void
-InitVModInfo(VModInfo * info, XkbDescPtr xkb)
+InitVModInfo(VModInfo * info, XkbcDescPtr xkb)
{
ClearVModInfo(info, xkb);
info->errorCount = 0;
}
void
-ClearVModInfo(VModInfo * info, XkbDescPtr xkb)
+ClearVModInfo(VModInfo * info, XkbcDescPtr xkb)
{
register int i;
register int i;
register char *fieldStr;
register char *modStr;
- XkbDescPtr xkb;
+ XkbcDescPtr xkb;
- xkb = (XkbDescPtr) priv;
+ xkb = (XkbcDescPtr) priv;
if ((xkb == NULL) || (xkb->names == NULL) || (elem != None)
|| (type != TypeInt))
{
}
int
-FindKeypadVMod(XkbDescPtr xkb)
+FindKeypadVMod(XkbcDescPtr xkb)
{
Atom name;
ExprResult rtrn;
typedef struct _VModInfo
{
- XkbDescPtr xkb;
+ XkbcDescPtr xkb;
unsigned defined;
unsigned available;
unsigned newlyDefined;
} VModInfo;
extern void InitVModInfo(VModInfo * /* info */ ,
- XkbDescPtr /* xkb */
+ XkbcDescPtr /* xkb */
);
extern void ClearVModInfo(VModInfo * /* info */ ,
- XkbDescPtr /* xkb */
+ XkbcDescPtr /* xkb */
);
extern Bool HandleVModDef(VModDef * /* stmt */ ,
);
extern Bool ApplyVModDefs(VModInfo * /* info */ ,
- XkbDescPtr /* xkb */
+ XkbcDescPtr /* xkb */
);
extern int LookupVModIndex(XPointer /* priv */ ,
ExprResult * /* val_rtrn */
);
-extern int FindKeypadVMod(XkbDescPtr /* xkb */
+extern int FindKeypadVMod(XkbcDescPtr /* xkb */
);
extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,
#include "utils.h"
#include <X11/extensions/XKM.h>
+#include "X11/extensions/XKBcommon.h"
extern char *scanFile;