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

Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew.

This commit is contained in:
Daniel Stone 2006-03-31 07:33:34 +00:00
parent 4c317bbc12
commit 7c44bb8c49
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,9 @@
* Xprint/ps/psout_ftpstype3.c: * Xprint/ps/psout_ftpstype3.c:
Add full FreeType support for Xprint. (Drew Parsons) Add full FreeType support for Xprint. (Drew Parsons)
* xkb/xkbfmisc.c:
Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew.
2006-03-30 Eric Anholt <anholt@FreeBSD.org> 2006-03-30 Eric Anholt <anholt@FreeBSD.org>
* exa/exa.c: (exaValidateGC): * exa/exa.c: (exaValidateGC):

36
xkb/xkbfmisc.c
View File

@ -68,42 +68,26 @@ XkbWriteXKBKeymapForNames( FILE * file,
unsigned want, unsigned want,
unsigned need) unsigned need)
{ {
unsigned complete = 0; if (!names || (!names->keycodes && !names->types && !names->compat &&
!names->symbols && !names->geometry))
if (names->keycodes) complete |= XkmKeyNamesMask;
if (names->types) complete |= XkmTypesMask;
if (names->compat) complete |= XkmCompatMapMask;
if (names->symbols) complete |= XkmSymbolsMask;
if (names->geometry) complete |= XkmGeometryMask;
if (complete == 0)
return False; return False;
if (complete & XkmSymbolsMask) fprintf(file, "xkb_keymap \"%s\" {\n", names->keymap ? names->keymap :
complete |= XkmKeyNamesMask | XkmTypesMask; "default");
fprintf(file, "xkb_keymap \"%s\" {\n",names->keymap ? names->keymap : if (names->keycodes)
"default");
ErrorF("xkb_keymap \"%s\" {\n",names->keymap ? names->keymap :
"default");
if (complete & XkmKeyNamesMask)
XkbWriteSectionFromName(file, "keycodes", names->keycodes); XkbWriteSectionFromName(file, "keycodes", names->keycodes);
if (names->types)
if (complete & XkmTypesMask)
XkbWriteSectionFromName(file, "types", names->types); XkbWriteSectionFromName(file, "types", names->types);
if (names->compat)
if (complete & XkmCompatMapMask)
XkbWriteSectionFromName(file, "compatibility", names->compat); XkbWriteSectionFromName(file, "compatibility", names->compat);
if (names->symbols)
if (complete & XkmSymbolsMask)
XkbWriteSectionFromName(file, "symbols", names->symbols); XkbWriteSectionFromName(file, "symbols", names->symbols);
if (names->geometry)
if (complete & XkmGeometryMask)
XkbWriteSectionFromName(file, "geometry", names->geometry); XkbWriteSectionFromName(file, "geometry", names->geometry);
fprintf(file,"};\n"); fprintf(file,"};\n");
ErrorF("};\n");
return True; return True;
} }