diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:12 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:12 +0000 |
| commit | 884711e0a1f677e6f3a69b0a16d5fac76f97babb (patch) | |
| tree | ad3ab92630460a74344862adb98b5e2277711a4f /xkbprint.c | |
| parent | 5c4a6e1092c1daa5423deae11396d6c454bbced0 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
Diffstat (limited to 'xkbprint.c')
| -rw-r--r-- | xkbprint.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbprint/xkbprint.c,v 3.9 2001/07/25 15:05:25 dawes Exp $ */ +/* $XFree86: xc/programs/xkbprint/xkbprint.c,v 3.11 2003/09/24 02:43:38 dawes Exp $ */ #include <stdio.h> #include <ctype.h> @@ -67,7 +67,6 @@ static char *fileTypeExt[] = { }; #endif -static unsigned inputFormat= INPUT_UNKNOWN; static unsigned outputFormat= WANT_DEFAULT; static char * wantLocale= "C"; static char * rootDir; @@ -77,7 +76,9 @@ static char * outputFont= NULL; static char * inDpyName,*outDpyName; static Display * inDpy; static Display * outDpy; +#ifdef NOTYET static Bool computeDflts= False; +#endif static XKBPrintArgs args; unsigned warningLevel= 5; Bool synch; @@ -186,7 +187,9 @@ register int i; } #endif else if (strcmp(argv[i],"-dflts")==0) { +#ifdef NOTYET computeDflts= True; +#endif uWarning("Compute defaults not implemented yet\n"); } else if (strcmp(argv[i],"-diffs")==0) { @@ -385,7 +388,9 @@ register int i; warningLevel= 0; } else { - sscanf(argv[++i],"%i",&warningLevel); + int itmp; + if (sscanf(argv[++i],"%i",&itmp)) + warningLevel = itmp; } } else { @@ -441,19 +446,17 @@ register int i; return False; } else if (uStringEqual(inputFile,"-")) { - inputFormat= INPUT_XKM; + /* Nothing */ } else if (strchr(inputFile,':')==0) { int len= strlen(inputFile); if ((len>4)&&(strcmp(&inputFile[len-4],".xkm")==0)) { - inputFormat= INPUT_XKM; + /* Nothing */ } else { FILE *file; file= fopen(inputFile,"r"); if (file) { - if (XkmProbe(file)) inputFormat= INPUT_XKM; - else inputFormat= INPUT_XKB; fclose(file); } else { @@ -465,7 +468,6 @@ register int i; else { inDpyName= inputFile; inputFile= NULL; - inputFormat= INPUT_XKM; } if (outputFormat==WANT_DEFAULT) |