StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxkbcomp: s/XkbDescPtr/XkbcDescPtr/ 

We need to use the keyboard description structure from XKBcommon.h since
it doesn't have the Display field.
master
Dan Nicholson 2009-03-27 20:01:32 -07:00
parent dd25bbc9ac
commit 37769b5a10
16 changed files with 97 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/xkbcomp/action.c
View File

@ -333,7 +333,7 @@ ReportNotFound(unsigned action, unsigned field, const char *what, char *bad)
} }
static Bool static Bool
HandleNoAction(XkbDescPtr xkb, HandleNoAction(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -363,7 +363,7 @@ CheckLatchLockFlags(unsigned action,
} }
static Bool static Bool
CheckModifierField(XkbDescPtr xkb, CheckModifierField(XkbcDescPtr xkb,
unsigned action, unsigned action,
ExprDef * value, ExprDef * value,
unsigned *flags_inout, unsigned *mods_rtrn) unsigned *flags_inout, unsigned *mods_rtrn)
@ -391,7 +391,7 @@ CheckModifierField(XkbDescPtr xkb,
} }
static Bool static Bool
HandleSetLatchMods(XkbDescPtr xkb, HandleSetLatchMods(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -437,7 +437,7 @@ HandleSetLatchMods(XkbDescPtr xkb,
} }
static Bool static Bool
HandleLockMods(XkbDescPtr xkb, HandleLockMods(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -514,7 +514,7 @@ CheckGroupField(unsigned action,
} }
static Bool static Bool
HandleSetLatchGroup(XkbDescPtr xkb, HandleSetLatchGroup(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -559,7 +559,7 @@ HandleSetLatchGroup(XkbDescPtr xkb,
} }
static Bool static Bool
HandleLockGroup(XkbDescPtr xkb, HandleLockGroup(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -585,7 +585,7 @@ HandleLockGroup(XkbDescPtr xkb,
} }
static Bool static Bool
HandleMovePtr(XkbDescPtr xkb, HandleMovePtr(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -650,7 +650,7 @@ static LookupEntry lockWhich[] = {
}; };
static Bool static Bool
HandlePtrBtn(XkbDescPtr xkb, HandlePtrBtn(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -712,7 +712,7 @@ static LookupEntry ptrDflts[] = {
}; };
static Bool static Bool
HandleSetPtrDflt(XkbDescPtr xkb, HandleSetPtrDflt(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -785,7 +785,7 @@ static LookupEntry isoNames[] = {
}; };
static Bool static Bool
HandleISOLock(XkbDescPtr xkb, HandleISOLock(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -833,7 +833,7 @@ HandleISOLock(XkbDescPtr xkb,
} }
static Bool static Bool
HandleSwitchScreen(XkbDescPtr xkb, HandleSwitchScreen(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -925,7 +925,7 @@ LookupEntry ctrlNames[] = {
}; };
static Bool static Bool
HandleSetLockControls(XkbDescPtr xkb, HandleSetLockControls(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -957,7 +957,7 @@ static LookupEntry evNames[] = {
}; };
static Bool static Bool
HandleActionMessage(XkbDescPtr xkb, HandleActionMessage(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -1035,7 +1035,7 @@ HandleActionMessage(XkbDescPtr xkb,
} }
static Bool static Bool
HandleRedirectKey(XkbDescPtr xkb, HandleRedirectKey(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -1091,7 +1091,7 @@ HandleRedirectKey(XkbDescPtr xkb,
} }
static Bool static Bool
HandleDeviceBtn(XkbDescPtr xkb, HandleDeviceBtn(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -1161,7 +1161,7 @@ HandleDeviceBtn(XkbDescPtr xkb,
} }
static Bool static Bool
HandleDeviceValuator(XkbDescPtr xkb, HandleDeviceValuator(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -1176,7 +1176,7 @@ HandleDeviceValuator(XkbDescPtr xkb,
} }
static Bool static Bool
HandlePrivate(XkbDescPtr xkb, HandlePrivate(XkbcDescPtr xkb,
XkbAnyAction * action, XkbAnyAction * action,
unsigned field, ExprDef * array_ndx, ExprDef * value) unsigned field, ExprDef * array_ndx, ExprDef * value)
{ {
@ -1244,7 +1244,7 @@ HandlePrivate(XkbDescPtr xkb,
return ReportIllegal(PrivateAction, field); return ReportIllegal(PrivateAction, field);
} }
typedef Bool(*actionHandler) (XkbDescPtr /* xkb */ , typedef Bool(*actionHandler) (XkbcDescPtr /* xkb */ ,
XkbAnyAction * /* action */ , XkbAnyAction * /* action */ ,
unsigned /* field */ , unsigned /* field */ ,
ExprDef * /* array_ndx */ , ExprDef * /* array_ndx */ ,
@ -1297,7 +1297,7 @@ ApplyActionFactoryDefaults(XkbAction * action)
int int
HandleActionDef(ExprDef * def, HandleActionDef(ExprDef * def,
XkbDescPtr xkb, XkbcDescPtr xkb,
XkbAnyAction * action, unsigned mergeMode, ActionInfo * info) XkbAnyAction * action, unsigned mergeMode, ActionInfo * info)
{ {
ExprDef *arg; ExprDef *arg;
@ -1396,7 +1396,7 @@ HandleActionDef(ExprDef * def,
/***====================================================================***/ /***====================================================================***/
int int
SetActionField(XkbDescPtr xkb, SetActionField(XkbcDescPtr xkb,
char *elem, char *elem,
char *field, char *field,
ExprDef * array_ndx, ExprDef * value, ActionInfo ** info_rtrn) ExprDef * array_ndx, ExprDef * value, ActionInfo ** info_rtrn)

4
src/xkbcomp/action.h
View File

@ -65,13 +65,13 @@ typedef struct _ActionInfo
} ActionInfo; } ActionInfo;
extern int HandleActionDef(ExprDef * /* def */ , extern int HandleActionDef(ExprDef * /* def */ ,
XkbDescPtr /* xkb */ , XkbcDescPtr /* xkb */ ,
XkbAnyAction * /* action */ , XkbAnyAction * /* action */ ,
unsigned /* mergeMode */ , unsigned /* mergeMode */ ,
ActionInfo * /* info */ ActionInfo * /* info */
); );
extern int SetActionField(XkbDescPtr /* xkb */ , extern int SetActionField(XkbcDescPtr /* xkb */ ,
char * /* elem */ , char * /* elem */ ,
char * /* field */ , char * /* field */ ,
ExprDef * /* index */ , ExprDef * /* index */ ,

2
src/xkbcomp/alias.c
View File

@ -156,7 +156,7 @@ MergeAliases(AliasInfo ** into, AliasInfo ** merge, unsigned how_merge)
} }
int int
ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) ApplyAliases(XkbcDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
{ {
register int i; register int i;
XkbKeyAliasPtr old, a; XkbKeyAliasPtr old, a;

2
src/xkbcomp/alias.h
View File

@ -48,7 +48,7 @@ extern Bool MergeAliases(AliasInfo ** /* into */ ,
unsigned /* how_merge */ unsigned /* how_merge */
); );
extern int ApplyAliases(XkbDescPtr /* xkb */ , extern int ApplyAliases(XkbcDescPtr /* xkb */ ,
Bool /* toGeom */ , Bool /* toGeom */ ,
AliasInfo ** /* info */ AliasInfo ** /* info */
); );

22
src/xkbcomp/compat.c
View File

@ -67,7 +67,7 @@ typedef struct _CompatInfo
LEDInfo *leds; LEDInfo *leds;
VModInfo vmods; VModInfo vmods;
ActionInfo *act; ActionInfo *act;
XkbDescPtr xkb; XkbcDescPtr xkb;
} CompatInfo; } CompatInfo;
/***====================================================================***/ /***====================================================================***/
@ -99,7 +99,7 @@ siText(SymInterpInfo * si, CompatInfo * info)
} }
static void static void
InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) InitCompatInfo(CompatInfo * info, XkbcDescPtr xkb)
{ {
register int i; register int i;
@ -132,7 +132,7 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb)
} }
static void static void
ClearCompatInfo(CompatInfo * info, XkbDescPtr xkb) ClearCompatInfo(CompatInfo * info, XkbcDescPtr xkb)
{ {
register int i; register int i;
@ -392,14 +392,14 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge)
} }
typedef void (*FileHandler) (XkbFile * /* rtrn */ , typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
XkbDescPtr /* xkb */ , XkbcDescPtr /* xkb */ ,
unsigned /* merge */ , unsigned /* merge */ ,
CompatInfo * /* info */ CompatInfo * /* info */
); );
static Bool static Bool
HandleIncludeCompatMap(IncludeStmt * stmt, HandleIncludeCompatMap(IncludeStmt * stmt,
XkbDescPtr xkb, CompatInfo * info, FileHandler hndlr) XkbcDescPtr xkb, CompatInfo * info, FileHandler hndlr)
{ {
unsigned newMerge; unsigned newMerge;
XkbFile *rtrn; XkbFile *rtrn;
@ -492,7 +492,7 @@ static LookupEntry useModMapValues[] = {
static int static int
SetInterpField(SymInterpInfo * si, SetInterpField(SymInterpInfo * si,
XkbDescPtr xkb, XkbcDescPtr xkb,
char *field, char *field,
ExprDef * arrayNdx, ExprDef * value, CompatInfo * info) ExprDef * arrayNdx, ExprDef * value, CompatInfo * info)
{ {
@ -603,7 +603,7 @@ LookupEntry groupNames[] = {
}; };
static int static int
HandleInterpVar(VarDef * stmt, XkbDescPtr xkb, CompatInfo * info) HandleInterpVar(VarDef * stmt, XkbcDescPtr xkb, CompatInfo * info)
{ {
ExprResult elem, field; ExprResult elem, field;
ExprDef *ndx; ExprDef *ndx;
@ -623,7 +623,7 @@ HandleInterpVar(VarDef * stmt, XkbDescPtr xkb, CompatInfo * info)
} }
static int static int
HandleInterpBody(VarDef * def, XkbDescPtr xkb, SymInterpInfo * si, HandleInterpBody(VarDef * def, XkbcDescPtr xkb, SymInterpInfo * si,
CompatInfo * info) CompatInfo * info)
{ {
int ok = 1; int ok = 1;
@ -646,7 +646,7 @@ HandleInterpBody(VarDef * def, XkbDescPtr xkb, SymInterpInfo * si,
} }
static int static int
HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge, HandleInterpDef(InterpDef * def, XkbcDescPtr xkb, unsigned merge,
CompatInfo * info) CompatInfo * info)
{ {
unsigned pred, mods; unsigned pred, mods;
@ -682,7 +682,7 @@ HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge,
static int static int
HandleGroupCompatDef(GroupCompatDef * def, HandleGroupCompatDef(GroupCompatDef * def,
XkbDescPtr xkb, unsigned merge, CompatInfo * info) XkbcDescPtr xkb, unsigned merge, CompatInfo * info)
{ {
ExprResult val; ExprResult val;
GroupCompatInfo tmp; GroupCompatInfo tmp;
@ -713,7 +713,7 @@ HandleGroupCompatDef(GroupCompatDef * def,
static void static void
HandleCompatMapFile(XkbFile * file, HandleCompatMapFile(XkbFile * file,
XkbDescPtr xkb, unsigned merge, CompatInfo * info) XkbcDescPtr xkb, unsigned merge, CompatInfo * info)
{ {
ParseCommon *stmt; ParseCommon *stmt;

12
src/xkbcomp/geometry.c
View File

@ -1324,13 +1324,13 @@ MergeIncludedGeometry(GeometryInfo * into, GeometryInfo * from,
} }
typedef void (*FileHandler) (XkbFile * /* file */ , typedef void (*FileHandler) (XkbFile * /* file */ ,
XkbDescPtr /* xkb */ , XkbcDescPtr /* xkb */ ,
unsigned /* merge */ , unsigned /* merge */ ,
GeometryInfo * /* info */ GeometryInfo * /* info */
); );
static Bool static Bool
HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr xkb, GeometryInfo * info, HandleIncludeGeometry(IncludeStmt * stmt, XkbcDescPtr xkb, GeometryInfo * info,
FileHandler hndlr) FileHandler hndlr)
{ {
unsigned newMerge; unsigned newMerge;
@ -2140,7 +2140,7 @@ SetGeometryProperty(GeometryInfo * info, char *property, ExprDef * value)
} }
static int static int
HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info) HandleGeometryVar(VarDef * stmt, XkbcDescPtr xkb, GeometryInfo * info)
{ {
ExprResult elem, field, tmp; ExprResult elem, field, tmp;
ExprDef *ndx; ExprDef *ndx;
@ -2488,7 +2488,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
} }
static int static int
HandleShapeDef(ShapeDef * def, XkbDescPtr xkb, unsigned merge, HandleShapeDef(ShapeDef * def, XkbcDescPtr xkb, unsigned merge,
GeometryInfo * info) GeometryInfo * info)
{ {
ShapeInfo si; ShapeInfo si;
@ -2809,7 +2809,7 @@ HandleSectionBody(SectionDef * def,
static int static int
HandleSectionDef(SectionDef * def, HandleSectionDef(SectionDef * def,
XkbDescPtr xkb, unsigned merge, GeometryInfo * info) XkbcDescPtr xkb, unsigned merge, GeometryInfo * info)
{ {
SectionInfo si; SectionInfo si;
char *str; char *str;
@ -2838,7 +2838,7 @@ HandleSectionDef(SectionDef * def,
static void static void
HandleGeometryFile(XkbFile * file, HandleGeometryFile(XkbFile * file,
XkbDescPtr xkb, unsigned merge, GeometryInfo * info) XkbcDescPtr xkb, unsigned merge, GeometryInfo * info)
{ {
ParseCommon *stmt; ParseCommon *stmt;
char *failWhat; char *failWhat;

4
src/xkbcomp/indicators.c
View File

@ -199,7 +199,7 @@ static LookupEntry groupComponentNames[] = {
int int
SetIndicatorMapField(LEDInfo * led, SetIndicatorMapField(LEDInfo * led,
XkbDescPtr xkb, XkbcDescPtr xkb,
char *field, ExprDef * arrayNdx, ExprDef * value) char *field, ExprDef * arrayNdx, ExprDef * value)
{ {
ExprResult rtrn; ExprResult rtrn;
@ -324,7 +324,7 @@ SetIndicatorMapField(LEDInfo * led,
LEDInfo * LEDInfo *
HandleIndicatorMapDef(IndicatorMapDef * def, HandleIndicatorMapDef(IndicatorMapDef * def,
XkbDescPtr xkb, XkbcDescPtr xkb,
LEDInfo * dflt, LEDInfo * oldLEDs, unsigned merge) LEDInfo * dflt, LEDInfo * oldLEDs, unsigned merge)
{ {
LEDInfo led, *rtrn; LEDInfo led, *rtrn;

4
src/xkbcomp/indicators.h
View File

@ -61,14 +61,14 @@ extern LEDInfo *AddIndicatorMap(LEDInfo * /* oldLEDs */ ,
); );
extern int SetIndicatorMapField(LEDInfo * /* led */ , extern int SetIndicatorMapField(LEDInfo * /* led */ ,
XkbDescPtr /* xkb */ , XkbcDescPtr /* xkb */ ,
char * /* field */ , char * /* field */ ,
ExprDef * /* arrayNdx */ , ExprDef * /* arrayNdx */ ,
ExprDef * /* value */ ExprDef * /* value */
); );
extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ , extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ ,
XkbDescPtr /* xkb */ , XkbcDescPtr /* xkb */ ,
LEDInfo * /* dflt */ , LEDInfo * /* dflt */ ,
LEDInfo * /* oldLEDs */ , LEDInfo * /* oldLEDs */ ,
unsigned /* mergeMode */ unsigned /* mergeMode */

6
src/xkbcomp/keycodes.c
View File

@ -82,7 +82,7 @@ typedef struct _KeyNamesInfo
} KeyNamesInfo; } KeyNamesInfo;
static void HandleKeycodesFile(XkbFile * file, static void HandleKeycodesFile(XkbFile * file,
XkbDescPtr xkb, XkbcDescPtr xkb,
unsigned merge, unsigned merge,
KeyNamesInfo * info); KeyNamesInfo * info);
@ -496,7 +496,7 @@ MergeIncludedKeycodes(KeyNamesInfo * into, KeyNamesInfo * from,
* @param info Struct to store the key info in. * @param info Struct to store the key info in.
*/ */
static Bool static Bool
HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr xkb, KeyNamesInfo * info) HandleIncludeKeycodes(IncludeStmt * stmt, XkbcDescPtr xkb, KeyNamesInfo * info)
{ {
unsigned newMerge; unsigned newMerge;
XkbFile *rtrn; XkbFile *rtrn;
@ -750,7 +750,7 @@ HandleIndicatorNameDef(IndicatorNameDef * def,
*/ */
static void static void
HandleKeycodesFile(XkbFile * file, HandleKeycodesFile(XkbFile * file,
XkbDescPtr xkb, unsigned merge, KeyNamesInfo * info) XkbcDescPtr xkb, unsigned merge, KeyNamesInfo * info)
{ {
ParseCommon *stmt; ParseCommon *stmt;

34
src/xkbcomp/keytypes.c
View File

@ -92,14 +92,14 @@ Atom tok_KEYPAD;
/***====================================================================***/ /***====================================================================***/
extern Bool AddMapEntry(XkbDescPtr /* xkb */ , extern Bool AddMapEntry(XkbcDescPtr /* xkb */ ,
KeyTypeInfo * /* type */ , KeyTypeInfo * /* type */ ,
XkbKTMapEntryPtr /* new */ , XkbKTMapEntryPtr /* new */ ,
Bool /* clobber */ , Bool /* clobber */ ,
Bool /* report */ Bool /* report */
); );
extern Bool AddPreserve(XkbDescPtr /* xkb */ , extern Bool AddPreserve(XkbcDescPtr /* xkb */ ,
KeyTypeInfo * /* type */ , KeyTypeInfo * /* type */ ,
PreserveInfo * /* new */ , PreserveInfo * /* new */ ,
Bool /* clobber */ , Bool /* clobber */ ,
@ -126,7 +126,7 @@ extern Bool AddLevelName(KeyTypeInfo * /* type */ ,
/***====================================================================***/ /***====================================================================***/
static void 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_ONE_LEVEL = XkbInternAtom(NULL, "ONE_LEVEL", False);
tok_TWO_LEVEL = XkbInternAtom(NULL, "TWO_LEVEL", False); tok_TWO_LEVEL = XkbInternAtom(NULL, "TWO_LEVEL", False);
@ -280,7 +280,7 @@ ReportTypeBadWidth(const char *type, int has, int needs)
} }
static Bool static Bool
AddKeyType(XkbDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new) AddKeyType(XkbcDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
{ {
KeyTypeInfo *old; KeyTypeInfo *old;
@ -366,7 +366,7 @@ AddKeyType(XkbDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
static void static void
MergeIncludedKeyTypes(KeyTypesInfo * into, MergeIncludedKeyTypes(KeyTypesInfo * into,
KeyTypesInfo * from, unsigned merge, XkbDescPtr xkb) KeyTypesInfo * from, unsigned merge, XkbcDescPtr xkb)
{ {
KeyTypeInfo *type; KeyTypeInfo *type;
@ -392,14 +392,14 @@ MergeIncludedKeyTypes(KeyTypesInfo * into,
} }
typedef void (*FileHandler) (XkbFile * /* file */ , typedef void (*FileHandler) (XkbFile * /* file */ ,
XkbDescPtr /* xkb */ , XkbcDescPtr /* xkb */ ,
unsigned /* merge */ , unsigned /* merge */ ,
KeyTypesInfo * /* included */ KeyTypesInfo * /* included */
); );
static Bool static Bool
HandleIncludeKeyTypes(IncludeStmt * stmt, HandleIncludeKeyTypes(IncludeStmt * stmt,
XkbDescPtr xkb, KeyTypesInfo * info, FileHandler hndlr) XkbcDescPtr xkb, KeyTypesInfo * info, FileHandler hndlr)
{ {
unsigned newMerge; unsigned newMerge;
XkbFile *rtrn; XkbFile *rtrn;
@ -544,7 +544,7 @@ NextMapEntry(KeyTypeInfo * type)
} }
Bool Bool
AddPreserve(XkbDescPtr xkb, AddPreserve(XkbcDescPtr xkb,
KeyTypeInfo * type, PreserveInfo * new, Bool clobber, Bool report) KeyTypeInfo * type, PreserveInfo * new, Bool clobber, Bool report)
{ {
PreserveInfo *old; PreserveInfo *old;
@ -616,7 +616,7 @@ AddPreserve(XkbDescPtr xkb,
* @param report True if a warning is to be printed on. * @param report True if a warning is to be printed on.
*/ */
Bool Bool
AddMapEntry(XkbDescPtr xkb, AddMapEntry(XkbcDescPtr xkb,
KeyTypeInfo * type, KeyTypeInfo * type,
XkbKTMapEntryPtr new, Bool clobber, Bool report) XkbKTMapEntryPtr new, Bool clobber, Bool report)
{ {
@ -682,7 +682,7 @@ static LookupEntry lnames[] = {
static Bool static Bool
SetMapEntry(KeyTypeInfo * type, SetMapEntry(KeyTypeInfo * type,
XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value) XkbcDescPtr xkb, ExprDef * arrayNdx, ExprDef * value)
{ {
ExprResult rtrn; ExprResult rtrn;
XkbKTMapEntryRec entry; XkbKTMapEntryRec entry;
@ -729,7 +729,7 @@ SetMapEntry(KeyTypeInfo * type,
static Bool static Bool
SetPreserve(KeyTypeInfo * type, SetPreserve(KeyTypeInfo * type,
XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value) XkbcDescPtr xkb, ExprDef * arrayNdx, ExprDef * value)
{ {
ExprResult rtrn; ExprResult rtrn;
PreserveInfo new; PreserveInfo new;
@ -878,7 +878,7 @@ SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, ExprDef * value)
*/ */
static Bool static Bool
SetKeyTypeField(KeyTypeInfo * type, SetKeyTypeField(KeyTypeInfo * type,
XkbDescPtr xkb, XkbcDescPtr xkb,
char *field, char *field,
ExprDef * arrayNdx, ExprDef * value, KeyTypesInfo * info) ExprDef * arrayNdx, ExprDef * value, KeyTypesInfo * info)
{ {
@ -937,7 +937,7 @@ SetKeyTypeField(KeyTypeInfo * type,
} }
static Bool static Bool
HandleKeyTypeVar(VarDef * stmt, XkbDescPtr xkb, KeyTypesInfo * info) HandleKeyTypeVar(VarDef * stmt, XkbcDescPtr xkb, KeyTypesInfo * info)
{ {
ExprResult elem, field; ExprResult elem, field;
ExprDef *arrayNdx; ExprDef *arrayNdx;
@ -963,7 +963,7 @@ HandleKeyTypeVar(VarDef * stmt, XkbDescPtr xkb, KeyTypesInfo * info)
static int static int
HandleKeyTypeBody(VarDef * def, HandleKeyTypeBody(VarDef * def,
XkbDescPtr xkb, KeyTypeInfo * type, KeyTypesInfo * info) XkbcDescPtr xkb, KeyTypeInfo * type, KeyTypesInfo * info)
{ {
int ok = 1; int ok = 1;
ExprResult tmp, field; ExprResult tmp, field;
@ -990,7 +990,7 @@ HandleKeyTypeBody(VarDef * def,
*/ */
static int static int
HandleKeyTypeDef(KeyTypeDef * def, HandleKeyTypeDef(KeyTypeDef * def,
XkbDescPtr xkb, unsigned merge, KeyTypesInfo * info) XkbcDescPtr xkb, unsigned merge, KeyTypesInfo * info)
{ {
register int i; register int i;
KeyTypeInfo type; KeyTypeInfo type;
@ -1071,7 +1071,7 @@ HandleKeyTypeDef(KeyTypeDef * def,
*/ */
static void static void
HandleKeyTypesFile(XkbFile * file, HandleKeyTypesFile(XkbFile * file,
XkbDescPtr xkb, unsigned merge, KeyTypesInfo * info) XkbcDescPtr xkb, unsigned merge, KeyTypesInfo * info)
{ {
ParseCommon *stmt; ParseCommon *stmt;
@ -1132,7 +1132,7 @@ HandleKeyTypesFile(XkbFile * file,
} }
static Bool static Bool
CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def) CopyDefToKeyType(XkbcDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def)
{ {
register int i; register int i;
PreserveInfo *pre; PreserveInfo *pre;

6
src/xkbcomp/misc.c
View File

@ -377,7 +377,7 @@ static KeyNameDesc dfltKeys[] = {
}; };
Status Status
ComputeKbdDefaults(XkbDescPtr xkb) ComputeKbdDefaults(XkbcDescPtr xkb)
{ {
Status rtrn; Status rtrn;
register int i, tmp, nUnknown; register int i, tmp, nUnknown;
@ -463,7 +463,7 @@ ComputeKbdDefaults(XkbDescPtr xkb)
* @return True if found, False otherwise. * @return True if found, False otherwise.
*/ */
Bool Bool
FindNamedKey(XkbDescPtr xkb, FindNamedKey(XkbcDescPtr xkb,
unsigned long name, unsigned long name,
unsigned int *kc_rtrn, unsigned int *kc_rtrn,
Bool use_aliases, Bool create, int start_from) Bool use_aliases, Bool create, int start_from)
@ -536,7 +536,7 @@ FindNamedKey(XkbDescPtr xkb,
} }
Bool Bool
FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lname, FindKeyNameForAlias(XkbcDescPtr xkb, unsigned long lname,
unsigned long *real_name) unsigned long *real_name)
{ {
register int i; register int i;

6
src/xkbcomp/misc.h
View File

@ -92,10 +92,10 @@ extern Bool ProcessIncludeFile(IncludeStmt * /* stmt */ ,
unsigned * /* merge_rtrn */ 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 long /* name */ ,
unsigned int * /* kc_rtrn */ , unsigned int * /* kc_rtrn */ ,
Bool /* use_aliases */ , Bool /* use_aliases */ ,
@ -103,7 +103,7 @@ extern Bool FindNamedKey(XkbDescPtr /* xkb */ ,
int /* start_from */ int /* start_from */
); );
extern Bool FindKeyNameForAlias(XkbDescPtr /* xkb */ , extern Bool FindKeyNameForAlias(XkbcDescPtr /* xkb */ ,
unsigned long /* lname */ , unsigned long /* lname */ ,
unsigned long * /* real_name */ unsigned long * /* real_name */
); );

30
src/xkbcomp/symbols.c
View File

@ -238,7 +238,7 @@ typedef struct _SymbolsInfo
} SymbolsInfo; } SymbolsInfo;
static void static void
InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb) InitSymbolsInfo(SymbolsInfo * info, XkbcDescPtr xkb)
{ {
register int i; register int i;
@ -601,7 +601,7 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from)
} }
static Bool static Bool
AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDescPtr xkb) AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbcDescPtr xkb)
{ {
register int i; register int i;
unsigned long real_name; unsigned long real_name;
@ -713,7 +713,7 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new)
static void static void
MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from, MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
unsigned merge, XkbDescPtr xkb) unsigned merge, XkbcDescPtr xkb)
{ {
register int i; register int i;
KeyInfo *key; KeyInfo *key;
@ -763,14 +763,14 @@ MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
} }
typedef void (*FileHandler) (XkbFile * /* rtrn */ , typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
XkbDescPtr /* xkb */ , XkbcDescPtr /* xkb */ ,
unsigned /* merge */ , unsigned /* merge */ ,
SymbolsInfo * /* included */ SymbolsInfo * /* included */
); );
static Bool static Bool
HandleIncludeSymbols(IncludeStmt * stmt, HandleIncludeSymbols(IncludeStmt * stmt,
XkbDescPtr xkb, SymbolsInfo * info, FileHandler hndlr) XkbcDescPtr xkb, SymbolsInfo * info, FileHandler hndlr)
{ {
unsigned newMerge; unsigned newMerge;
XkbFile *rtrn; XkbFile *rtrn;
@ -930,7 +930,7 @@ GetGroupIndex(KeyInfo * key,
static Bool static Bool
AddSymbolsToKey(KeyInfo * key, AddSymbolsToKey(KeyInfo * key,
XkbDescPtr xkb, XkbcDescPtr xkb,
char *field, char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{ {
@ -980,7 +980,7 @@ AddSymbolsToKey(KeyInfo * key,
static Bool static Bool
AddActionsToKey(KeyInfo * key, AddActionsToKey(KeyInfo * key,
XkbDescPtr xkb, XkbcDescPtr xkb,
char *field, char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{ {
@ -1116,7 +1116,7 @@ static LookupEntry rgEntries[] = {
static Bool static Bool
SetSymbolsField(KeyInfo * key, SetSymbolsField(KeyInfo * key,
XkbDescPtr xkb, XkbcDescPtr xkb,
char *field, char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{ {
@ -1402,7 +1402,7 @@ SetGroupName(SymbolsInfo * info, ExprDef * arrayNdx, ExprDef * value)
} }
static int static int
HandleSymbolsVar(VarDef * stmt, XkbDescPtr xkb, SymbolsInfo * info) HandleSymbolsVar(VarDef * stmt, XkbcDescPtr xkb, SymbolsInfo * info)
{ {
ExprResult elem, field, tmp; ExprResult elem, field, tmp;
ExprDef *arrayNdx; ExprDef *arrayNdx;
@ -1484,7 +1484,7 @@ HandleSymbolsVar(VarDef * stmt, XkbDescPtr xkb, SymbolsInfo * info)
static Bool static Bool
HandleSymbolsBody(VarDef * def, HandleSymbolsBody(VarDef * def,
XkbDescPtr xkb, KeyInfo * key, SymbolsInfo * info) XkbcDescPtr xkb, KeyInfo * key, SymbolsInfo * info)
{ {
Bool ok = True; Bool ok = True;
ExprResult tmp, field; ExprResult tmp, field;
@ -1562,7 +1562,7 @@ SetExplicitGroup(SymbolsInfo * info, KeyInfo * key)
static int static int
HandleSymbolsDef(SymbolsDef * stmt, HandleSymbolsDef(SymbolsDef * stmt,
XkbDescPtr xkb, unsigned merge, SymbolsInfo * info) XkbcDescPtr xkb, unsigned merge, SymbolsInfo * info)
{ {
KeyInfo key; KeyInfo key;
@ -1592,7 +1592,7 @@ HandleSymbolsDef(SymbolsDef * stmt,
static Bool static Bool
HandleModMapDef(ModMapDef * def, HandleModMapDef(ModMapDef * def,
XkbDescPtr xkb, unsigned merge, SymbolsInfo * info) XkbcDescPtr xkb, unsigned merge, SymbolsInfo * info)
{ {
ExprDef *key; ExprDef *key;
ModMapEntry tmp; ModMapEntry tmp;
@ -1635,7 +1635,7 @@ HandleModMapDef(ModMapDef * def,
static void static void
HandleSymbolsFile(XkbFile * file, HandleSymbolsFile(XkbFile * file,
XkbDescPtr xkb, unsigned merge, SymbolsInfo * info) XkbcDescPtr xkb, unsigned merge, SymbolsInfo * info)
{ {
ParseCommon *stmt; ParseCommon *stmt;
@ -1695,7 +1695,7 @@ HandleSymbolsFile(XkbFile * file,
} }
static Bool 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 int i, j;
register Bool gotOne; register Bool gotOne;
@ -1731,7 +1731,7 @@ FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned int *kc_rtrn)
* @return True if found, False otherwise. * @return True if found, False otherwise.
*/ */
static Bool static Bool
FindNamedType(XkbDescPtr xkb, Atom name, unsigned *type_rtrn) FindNamedType(XkbcDescPtr xkb, Atom name, unsigned *type_rtrn)
{ {
register unsigned n; register unsigned n;

10
src/xkbcomp/vmod.c
View File

@ -37,7 +37,7 @@
#include "vmod.h" #include "vmod.h"
void void
InitVModInfo(VModInfo * info, XkbDescPtr xkb) InitVModInfo(VModInfo * info, XkbcDescPtr xkb)
{ {
ClearVModInfo(info, xkb); ClearVModInfo(info, xkb);
info->errorCount = 0; info->errorCount = 0;
@ -45,7 +45,7 @@ InitVModInfo(VModInfo * info, XkbDescPtr xkb)
} }
void void
ClearVModInfo(VModInfo * info, XkbDescPtr xkb) ClearVModInfo(VModInfo * info, XkbcDescPtr xkb)
{ {
register int i; register int i;
@ -173,9 +173,9 @@ LookupVModIndex(XPointer priv,
register int i; register int i;
register char *fieldStr; register char *fieldStr;
register char *modStr; register char *modStr;
XkbDescPtr xkb; XkbcDescPtr xkb;
xkb = (XkbDescPtr) priv; xkb = (XkbcDescPtr) priv;
if ((xkb == NULL) || (xkb->names == NULL) || (elem != None) if ((xkb == NULL) || (xkb->names == NULL) || (elem != None)
|| (type != TypeInt)) || (type != TypeInt))
{ {
@ -226,7 +226,7 @@ LookupVModMask(XPointer priv,
} }
int int
FindKeypadVMod(XkbDescPtr xkb) FindKeypadVMod(XkbcDescPtr xkb)
{ {
Atom name; Atom name;
ExprResult rtrn; ExprResult rtrn;

10
src/xkbcomp/vmod.h
View File

@ -29,7 +29,7 @@
typedef struct _VModInfo typedef struct _VModInfo
{ {
XkbDescPtr xkb; XkbcDescPtr xkb;
unsigned defined; unsigned defined;
unsigned available; unsigned available;
unsigned newlyDefined; unsigned newlyDefined;
@ -37,11 +37,11 @@ typedef struct _VModInfo
} VModInfo; } VModInfo;
extern void InitVModInfo(VModInfo * /* info */ , extern void InitVModInfo(VModInfo * /* info */ ,
XkbDescPtr /* xkb */ XkbcDescPtr /* xkb */
); );
extern void ClearVModInfo(VModInfo * /* info */ , extern void ClearVModInfo(VModInfo * /* info */ ,
XkbDescPtr /* xkb */ XkbcDescPtr /* xkb */
); );
extern Bool HandleVModDef(VModDef * /* stmt */ , extern Bool HandleVModDef(VModDef * /* stmt */ ,
@ -50,7 +50,7 @@ extern Bool HandleVModDef(VModDef * /* stmt */ ,
); );
extern Bool ApplyVModDefs(VModInfo * /* info */ , extern Bool ApplyVModDefs(VModInfo * /* info */ ,
XkbDescPtr /* xkb */ XkbcDescPtr /* xkb */
); );
extern int LookupVModIndex(XPointer /* priv */ , extern int LookupVModIndex(XPointer /* priv */ ,
@ -67,7 +67,7 @@ extern int LookupVModMask(XPointer /* priv */ ,
ExprResult * /* val_rtrn */ ExprResult * /* val_rtrn */
); );
extern int FindKeypadVMod(XkbDescPtr /* xkb */ extern int FindKeypadVMod(XkbcDescPtr /* xkb */
); );
extern Bool ResolveVirtualModifier(ExprDef * /* def */ , extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,

1
src/xkbcomp/xkbcomp.h
View File

@ -37,6 +37,7 @@
#include "utils.h" #include "utils.h"
#include <X11/extensions/XKM.h> #include <X11/extensions/XKM.h>
#include "X11/extensions/XKBcommon.h"
extern char *scanFile; extern char *scanFile;