diff options
Diffstat (limited to 'app/xkbcomp/keymap.c')
-rw-r--r-- | app/xkbcomp/keymap.c | 247 |
1 files changed, 131 insertions, 116 deletions
diff --git a/app/xkbcomp/keymap.c b/app/xkbcomp/keymap.c index 86e9c9e8f..a419d8c42 100644 --- a/app/xkbcomp/keymap.c +++ b/app/xkbcomp/keymap.c @@ -1,4 +1,3 @@ -/* $Xorg: keymap.c,v 1.3 2000/08/17 19:54:32 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #include "xkbcomp.h" #include "tokens.h" @@ -41,128 +39,145 @@ #define SYMBOLS 4 #define MAX_SECTIONS 5 -XkbFile * sections[MAX_SECTIONS]; +static XkbFile *sections[MAX_SECTIONS]; +/** + * Compile the given file and store the output in result. + * @param file A list of XkbFiles, each denoting one type (e.g. + * XkmKeyNamesIdx, etc.) + */ Bool -CompileKeymap(XkbFile *file,XkbFileInfo *result,unsigned merge) +CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge) { -unsigned have; -Bool ok; -unsigned required,legal; -unsigned mainType; -char * mainName; -LEDInfo * unbound= NULL; + unsigned have; + Bool ok; + unsigned required, legal; + unsigned mainType; + char *mainName; + LEDInfo *unbound = NULL; - bzero(sections,MAX_SECTIONS*sizeof(XkbFile *)); - mainType= file->type; - mainName= file->name; - switch (mainType) { - case XkmSemanticsFile: - required= XkmSemanticsRequired; - legal= XkmSemanticsLegal; - break; - case XkmLayoutFile: - required= XkmLayoutRequired; - legal= XkmKeymapLegal; - break; - case XkmKeymapFile: - required= XkmKeymapRequired; - legal= XkmKeymapLegal; - break; - default: - ERROR1("Cannot compile %s alone into an XKM file\n", - XkbConfigText(mainType,XkbMessage)); - return False; + bzero(sections, MAX_SECTIONS * sizeof(XkbFile *)); + mainType = file->type; + mainName = file->name; + switch (mainType) + { + case XkmSemanticsFile: + required = XkmSemanticsRequired; + legal = XkmSemanticsLegal; + break; + case XkmLayoutFile: /* standard type if setxkbmap -print */ + required = XkmLayoutRequired; + legal = XkmKeymapLegal; + break; + case XkmKeymapFile: + required = XkmKeymapRequired; + legal = XkmKeymapLegal; + break; + default: + ERROR1("Cannot compile %s alone into an XKM file\n", + XkbConfigText(mainType, XkbMessage)); + return False; } - have= 0; - ok= 1; - file= (XkbFile *)file->defs; - while ((file)&&(ok)) { - file->topName= mainName; - if ((have&(1<<file->type))!=0) { - ERROR2("More than one %s section in a %s file\n", - XkbConfigText(file->type,XkbMessage), - XkbConfigText(mainType,XkbMessage)); - ACTION("All sections after the first ignored\n"); - ok= False; - } - else if ((1<<file->type)&(~legal)) { - ERROR2("Cannot define %s in a %s file\n", - XkbConfigText(file->type,XkbMessage), - XkbConfigText(mainType,XkbMessage)); - ok= False; - } - else switch (file->type) { - case XkmSemanticsFile: - case XkmLayoutFile: - case XkmKeymapFile: - WSGO2("Illegal %s configuration in a %s file\n", - XkbConfigText(file->type,XkbMessage), - XkbConfigText(mainType,XkbMessage)); - ACTION("Ignored\n"); - ok= False; - break; - case XkmKeyNamesIndex: - sections[KEYCODES]= file; - break; - case XkmTypesIndex: - sections[TYPES]= file; - break; - case XkmSymbolsIndex: - sections[SYMBOLS]= file; - break; - case XkmCompatMapIndex: - sections[COMPAT]= file; - break; - case XkmGeometryIndex: - case XkmGeometryFile: - sections[GEOMETRY]= file; - break; - case XkmVirtualModsIndex: - case XkmIndicatorsIndex: - WSGO1("Found an isolated %s section\n", - XkbConfigText(file->type,XkbMessage)); - break; - default: - WSGO1("Unknown file type %d\n",file->type); - break; - } - if (ok) - have|= (1<<file->type); - file= (XkbFile*)file->common.next; + have = 0; + ok = 1; + file = (XkbFile *) file->defs; + /* Check for duplicate entries in the input file */ + while ((file) && (ok)) + { + file->topName = mainName; + if ((have & (1 << file->type)) != 0) + { + ERROR2("More than one %s section in a %s file\n", + XkbConfigText(file->type, XkbMessage), + XkbConfigText(mainType, XkbMessage)); + ACTION("All sections after the first ignored\n"); + ok = False; + } + else if ((1 << file->type) & (~legal)) + { + ERROR2("Cannot define %s in a %s file\n", + XkbConfigText(file->type, XkbMessage), + XkbConfigText(mainType, XkbMessage)); + ok = False; + } + else + switch (file->type) + { + case XkmSemanticsFile: + case XkmLayoutFile: + case XkmKeymapFile: + WSGO2("Illegal %s configuration in a %s file\n", + XkbConfigText(file->type, XkbMessage), + XkbConfigText(mainType, XkbMessage)); + ACTION("Ignored\n"); + ok = False; + break; + case XkmKeyNamesIndex: + sections[KEYCODES] = file; + break; + case XkmTypesIndex: + sections[TYPES] = file; + break; + case XkmSymbolsIndex: + sections[SYMBOLS] = file; + break; + case XkmCompatMapIndex: + sections[COMPAT] = file; + break; + case XkmGeometryIndex: + case XkmGeometryFile: + sections[GEOMETRY] = file; + break; + case XkmVirtualModsIndex: + case XkmIndicatorsIndex: + WSGO1("Found an isolated %s section\n", + XkbConfigText(file->type, XkbMessage)); + break; + default: + WSGO1("Unknown file type %d\n", file->type); + break; + } + if (ok) + have |= (1 << file->type); + file = (XkbFile *) file->common.next; } - if (ok) { - if (ok && (sections[KEYCODES]!=NULL)) - ok= CompileKeycodes(sections[KEYCODES],result,MergeOverride); - if (ok && (sections[GEOMETRY]!=NULL)) - ok= CompileGeometry(sections[GEOMETRY],result,MergeOverride); - if (ok && (sections[TYPES]!=NULL)) - ok= CompileKeyTypes(sections[TYPES],result,MergeOverride); - if (ok && (sections[COMPAT]!=NULL)) - ok=CompileCompatMap(sections[COMPAT],result,MergeOverride,&unbound); - if (ok && (sections[SYMBOLS]!=NULL)) - ok= CompileSymbols(sections[SYMBOLS],result,MergeOverride); + /* compile the sections we have in the file one-by-one, or fail. */ + if (ok) + { + if (ok && (sections[KEYCODES] != NULL)) + ok = CompileKeycodes(sections[KEYCODES], result, MergeOverride); + if (ok && (sections[GEOMETRY] != NULL)) + ok = CompileGeometry(sections[GEOMETRY], result, MergeOverride); + if (ok && (sections[TYPES] != NULL)) + ok = CompileKeyTypes(sections[TYPES], result, MergeOverride); + if (ok && (sections[COMPAT] != NULL)) + ok = CompileCompatMap(sections[COMPAT], result, MergeOverride, + &unbound); + if (ok && (sections[SYMBOLS] != NULL)) + ok = CompileSymbols(sections[SYMBOLS], result, MergeOverride); } if (!ok) - return False; - result->defined= have; - if (required&(~have)) { - register int i,bit; - unsigned missing; - missing= required&(~have); - for (i=0,bit=1;missing!=0;i++,bit<<=1) { - if (missing&bit) { - ERROR2("Missing %s section in a %s file\n", - XkbConfigText(i,XkbMessage), - XkbConfigText(mainType,XkbMessage)); - missing&=~bit; - } - } - ACTION1("Description of %s not compiled\n", - XkbConfigText(mainType,XkbMessage)); - ok= False; + return False; + result->defined = have; + if (required & (~have)) + { + register int i, bit; + unsigned missing; + missing = required & (~have); + for (i = 0, bit = 1; missing != 0; i++, bit <<= 1) + { + if (missing & bit) + { + ERROR2("Missing %s section in a %s file\n", + XkbConfigText(i, XkbMessage), + XkbConfigText(mainType, XkbMessage)); + missing &= ~bit; + } + } + ACTION1("Description of %s not compiled\n", + XkbConfigText(mainType, XkbMessage)); + ok = False; } - ok= BindIndicators(result,True,unbound,NULL); + ok = BindIndicators(result, True, unbound, NULL); return ok; } - |