notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added "--lang help" and "--lang list"; moved languages out of regular

Browse source 
usage display.
This commit is contained in:
William Kendrick 2003-09-05 06:49:52 +00:00
parent 4bae55cf86
commit 5e998b1c12
2 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/CHANGES.txt
View file

@ -7,11 +7,17 @@ bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/ http://www.newbreedsoftware.com/tuxpaint/
2003.Sep.03 (0.9.13) [cvs] 2003.Sep.04 (0.9.13) [cvs]
* Fixed incorrect tag in HTML documentation. (Bad results in IE) * Fixed incorrect tag in HTML documentation. (Bad results in IE)
* Fixed typo regarding "savedir" in README. * Fixed typo regarding "savedir" in README.
* 'printcfg' options not displayed in usage, except on Win32.
* Moved available language listing to its own usage, shown when
"--lang" called incorrectly, or as "--lang list" or "--lang help".
(Suggested by Ben Armstrong)
2003.Aug.18 (0.9.12) 2003.Aug.18 (0.9.12)
* Replaced "efont-serif" fonts with those from the 'ttf-freefont' package, * Replaced "efont-serif" fonts with those from the 'ttf-freefont' package,

46
src/tuxpaint.c
View file

@ -7,12 +7,12 @@
bill@newbreedsoftware.com bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/ http://www.newbreedsoftware.com/tuxpaint/
June 14, 2002 - August 18, 2003 June 14, 2002 - September 4, 2003
*/ */
#define VER_VERSION "0.9.12" #define VER_VERSION "0.9.13"
#define VER_DATE "2003.08.18" #define VER_DATE "2003.09.04"
/* #define DEBUG */ /* #define DEBUG */
@ -491,6 +491,8 @@ void blit_magic(int x, int y, int x2, int y2);
void stamp_draw(int x, int y); void stamp_draw(int x, int y);
void rec_undo_buffer(void); void rec_undo_buffer(void);
void update_canvas(int x1, int y1, int x2, int y2); void update_canvas(int x1, int y1, int x2, int y2);
void show_usage(FILE * f, char * prg);
void show_lang_usage(FILE * f, char * prg);
void setup(int argc, char * argv[]); void setup(int argc, char * argv[]);
SDL_Cursor * get_cursor(char * bits, char * mask_bits, SDL_Cursor * get_cursor(char * bits, char * mask_bits,
int w, int h, int x, int y); int w, int h, int x, int y);
@ -3353,6 +3355,7 @@ void show_version(void)
void show_usage(FILE * f, char * prg) void show_usage(FILE * f, char * prg)
{ {
fprintf(f, fprintf(f,
"\n"
"Usage: %s {--usage | --help | --version | --copying}\n" "Usage: %s {--usage | --help | --version | --copying}\n"
" %s [--fullscreen] [--800x600] [--nosound] [--noquit] [--noprint]\n" " %s [--fullscreen] [--800x600] [--nosound] [--noquit] [--noprint]\n"
" [--simpleshapes] [--uppercase] [--grab] [--nowheelmouse]\n" " [--simpleshapes] [--uppercase] [--grab] [--nowheelmouse]\n"
@ -3362,11 +3365,29 @@ void show_usage(FILE * f, char * prg)
" [--complexshapes] [--mixedcase] [--dontgrab] [--wheelmouse]\n" " [--complexshapes] [--mixedcase] [--dontgrab] [--wheelmouse]\n"
" [--fancycursors] [--mouse] [--outlines] [--stamps]\n" " [--fancycursors] [--mouse] [--outlines] [--stamps]\n"
" [--saveoverask]\n" " [--saveoverask]\n"
" %s [--printcfg | --noprintcfg] (Windows only)\n" #ifdef WIN32
" %s [--printcfg | --noprintcfg]\n"
#endif
" %s [--printdelay=SECONDS]\n" " %s [--printdelay=SECONDS]\n"
" [--lang LANGUAGE | --locale LOCALE]\n" " %s [--lang LANGUAGE | --locale LOCALE]\n"
" %s [--nosysconfig]\n" " %s [--nosysconfig]\n"
/* " %s [--record FILE | --playback FILE]\n" */ /* " %s [--record FILE | --playback FILE]\n" */
"\n",
prg, prg, prg,
#ifdef WIN32
prg,
#endif
prg, prg, prg /* , prg */ );
}
/* Show available languages: */
void show_lang_usage(FILE * f, char * prg)
{
fprintf(f,
"\n"
"Usage: %s [--lang LANGUAGE | --locale LOCALE]\n"
"\n" "\n"
"LANGUAGE may be one of:\n" "LANGUAGE may be one of:\n"
" english american-english\n" " english american-english\n"
@ -3401,10 +3422,11 @@ void show_usage(FILE * f, char * prg)
" turkish\n" " turkish\n"
" walloon\n" " walloon\n"
"\n", "\n",
prg, prg, prg, prg, prg, prg /* , prg */ ); prg);
} }
const char *getfilename(const char* path) const char *getfilename(const char* path)
{ {
char *p; char *p;
@ -3716,7 +3738,7 @@ void setup(int argc, char * argv[])
/* Forgot to specify the language! */ /* Forgot to specify the language! */
fprintf(stderr, "%s takes an argument\n", argv[i]); fprintf(stderr, "%s takes an argument\n", argv[i]);
show_usage(stderr, (char *) getfilename(argv[0])); show_lang_usage(stderr, (char *) getfilename(argv[0]));
exit(1); exit(1);
} }
} }
@ -3735,7 +3757,7 @@ void setup(int argc, char * argv[])
/* Forgot to specify the language! */ /* Forgot to specify the language! */
fprintf(stderr, "%s takes an argument\n", argv[i]); fprintf(stderr, "%s takes an argument\n", argv[i]);
show_usage(stderr, (char *) getfilename(argv[0])); show_lang_usage(stderr, (char *) getfilename(argv[0]));
exit(1); exit(1);
} }
} }
@ -4037,10 +4059,16 @@ void setup(int argc, char * argv[])
putenv("LANG=zh_CN.UTF-8"); putenv("LANG=zh_CN.UTF-8");
putenv("LC_ALL=zh_CN.UTF-8"); putenv("LC_ALL=zh_CN.UTF-8");
} }
else if (strcmp(langstr, "help") == 0 || strcmp(langstr, "list") == 0)
{
show_lang_usage(stdout, (char *) getfilename(argv[0]));
free(langstr);
exit(0);
}
else else
{ {
fprintf(stderr, "%s is an invalid language\n", langstr); fprintf(stderr, "%s is an invalid language\n", langstr);
show_usage(stderr, (char *) getfilename(argv[0])); show_lang_usage(stderr, (char *) getfilename(argv[0]));
free(langstr); free(langstr);
exit(1); exit(1);
} }