frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XKB: Simplify keymap writing a bit 

We don't need no temporary variable.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2008-08-09 17:02:02 +03:00
parent feb757f384
commit b5242789ed
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xkb/xkbfmisc.c
View File

@ -163,14 +163,13 @@ XkbWriteXKBKeymapForNames( FILE * file,
unsigned want, unsigned want,
unsigned need) unsigned need)
{ {
char * name,*tmp; char * tmp;
unsigned complete; unsigned complete;
XkbNamesPtr old_names; XkbNamesPtr old_names;
int multi_section; int multi_section;
unsigned wantNames,wantConfig,wantDflts; unsigned wantNames,wantConfig,wantDflts;
complete= 0; complete= 0;
name= "default";
if (COMPLETE(names->keycodes)) complete|= XkmKeyNamesMask; if (COMPLETE(names->keycodes)) complete|= XkmKeyNamesMask;
if (COMPLETE(names->types)) complete|= XkmTypesMask; if (COMPLETE(names->types)) complete|= XkmTypesMask;
if (COMPLETE(names->compat)) complete|= XkmCompatMapMask; if (COMPLETE(names->compat)) complete|= XkmCompatMapMask;
@ -292,15 +291,15 @@ unsigned wantNames,wantConfig,wantDflts;
multi_section= 1; multi_section= 1;
if (((complete&XkmKeymapRequired)==XkmKeymapRequired)&& if (((complete&XkmKeymapRequired)==XkmKeymapRequired)&&
((complete&(~XkmKeymapLegal))==0)) { ((complete&(~XkmKeymapLegal))==0)) {
fprintf(file,"xkb_keymap \"%s\" {\n",name); fprintf(file,"xkb_keymap \"default\" {\n");
} }
else if (((complete&XkmSemanticsRequired)==XkmSemanticsRequired)&& else if (((complete&XkmSemanticsRequired)==XkmSemanticsRequired)&&
((complete&(~XkmSemanticsLegal))==0)) { ((complete&(~XkmSemanticsLegal))==0)) {
fprintf(file,"xkb_semantics \"%s\" {\n",name); fprintf(file,"xkb_semantics \"default\" {\n");
} }
else if (((complete&XkmLayoutRequired)==XkmLayoutRequired)&& else if (((complete&XkmLayoutRequired)==XkmLayoutRequired)&&
((complete&(~XkmLayoutLegal))==0)) { ((complete&(~XkmLayoutLegal))==0)) {
fprintf(file,"xkb_layout \"%s\" {\n",name); fprintf(file,"xkb_layout \"default\" {\n");
} }
else if (XkmSingleSection(complete&(~XkmVirtualModsMask))) { else if (XkmSingleSection(complete&(~XkmVirtualModsMask))) {
multi_section= 0; multi_section= 0;
@ -310,41 +309,36 @@ unsigned wantNames,wantConfig,wantDflts;
} }
wantNames= complete&(~(wantConfig|wantDflts)); wantNames= complete&(~(wantConfig|wantDflts));
name= names->keycodes;
if (wantConfig&XkmKeyNamesMask) if (wantConfig&XkmKeyNamesMask)
XkbWriteXKBKeycodes(file,xkb,False,False,_AddIncl,name); XkbWriteXKBKeycodes(file,xkb,False,False,_AddIncl,names->keycodes);
else if (wantDflts&XkmKeyNamesMask) else if (wantDflts&XkmKeyNamesMask)
fprintf(stderr,"Default symbols not implemented yet!\n"); fprintf(stderr,"Default symbols not implemented yet!\n");
else if (wantNames&XkmKeyNamesMask) else if (wantNames&XkmKeyNamesMask)
XkbWriteSectionFromName(file,"keycodes",name); XkbWriteSectionFromName(file,"keycodes",names->keycodes);
name= names->types;
if (wantConfig&XkmTypesMask) if (wantConfig&XkmTypesMask)
XkbWriteXKBKeyTypes(file,xkb,False,False,_AddIncl,name); XkbWriteXKBKeyTypes(file,xkb,False,False,_AddIncl,names->types);
else if (wantDflts&XkmTypesMask) else if (wantDflts&XkmTypesMask)
fprintf(stderr,"Default types not implemented yet!\n"); fprintf(stderr,"Default types not implemented yet!\n");
else if (wantNames&XkmTypesMask) else if (wantNames&XkmTypesMask)
XkbWriteSectionFromName(file,"types",name); XkbWriteSectionFromName(file,"types",names->types);
name= names->compat;
if (wantConfig&XkmCompatMapMask) if (wantConfig&XkmCompatMapMask)
XkbWriteXKBCompatMap(file,xkb,False,False,_AddIncl,name); XkbWriteXKBCompatMap(file,xkb,False,False,_AddIncl,names->compat);
else if (wantDflts&XkmCompatMapMask) else if (wantDflts&XkmCompatMapMask)
fprintf(stderr,"Default interps not implemented yet!\n"); fprintf(stderr,"Default interps not implemented yet!\n");
else if (wantNames&XkmCompatMapMask) else if (wantNames&XkmCompatMapMask)
XkbWriteSectionFromName(file,"compatibility",name); XkbWriteSectionFromName(file,"compatibility",names->compat);
name= names->symbols;
if (wantConfig&XkmSymbolsMask) if (wantConfig&XkmSymbolsMask)
XkbWriteXKBSymbols(file,xkb,False,False,_AddIncl,name); XkbWriteXKBSymbols(file,xkb,False,False,_AddIncl,names->symbols);
else if (wantNames&XkmSymbolsMask) else if (wantNames&XkmSymbolsMask)
XkbWriteSectionFromName(file,"symbols",name); XkbWriteSectionFromName(file,"symbols",names->symbols);
name= names->geometry;
if (wantConfig&XkmGeometryMask) if (wantConfig&XkmGeometryMask)
XkbWriteXKBGeometry(file,xkb,False,False,_AddIncl,name); XkbWriteXKBGeometry(file,xkb,False,False,_AddIncl,names->geometry);
else if (wantNames&XkmGeometryMask) else if (wantNames&XkmGeometryMask)
XkbWriteSectionFromName(file,"geometry",name); XkbWriteSectionFromName(file,"geometry",names->geometry);
if (multi_section) if (multi_section)
fprintf(file,"};\n"); fprintf(file,"};\n");