X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=c374f69406f574bda60daeef288dc3934666e788;hb=12fcb33bfaa03b3c6245d15bfb1809f7facc857f;hp=e213c8085b87cc9cf460a7ddae41218a358b5505;hpb=b3737edc7cc7d1ebc52ec204dcaa71d9cb859c5a;p=chaz%2Fopenbox diff --git a/src/main.cc b/src/main.cc index e213c808..c374f694 100644 --- a/src/main.cc +++ b/src/main.cc @@ -61,11 +61,12 @@ I18n i18n; // initialized in main static void showHelp(int exitval) { // print program usage and command line options printf(i18n(mainSet, mainUsage, - "Blackbox %s : (c) 2001 - 2002 Sean 'Shaleh' Perry\n" - "\t\t\t 1997 - 2000, 2002 Brad Hughes\n\n" + "Openbox %s : (c) 2002 - 2002 Ben Jansens\n" + " 2001 - 2002 Sean 'Shaleh' Perry\n" + " 1997 - 2000, 2002 Brad Hughes\n\n" " -display \t\tuse display connection.\n" " -rc \t\t\tuse alternate resource file.\n" - " -menu \t\t\tuse alternate menu file.\n" + " -menu \t\tuse alternate menu file.\n" " -version\t\t\tdisplay version and exit.\n" " -help\t\t\t\tdisplay this help text and exit.\n\n"), __openbox_version); @@ -76,6 +77,8 @@ static void showHelp(int exitval) { "Compile time options:\n" " Debugging:\t\t\t%s\n" " Shape:\t\t\t%s\n" + " Slit:\t\t\t\t%s\n" + " Event Clobbering:\t\t%s\n" " 8bpp Ordered Dithering:\t%s\n\n"), #ifdef DEBUG i18n(CommonSet, CommonYes, "yes"), @@ -89,6 +92,18 @@ static void showHelp(int exitval) { i18n(CommonSet, CommonNo, "no"), #endif // SHAPE +#ifdef SLIT + i18n(CommonSet, CommonYes, "yes"), +#else // !SLIT + i18n(CommonSet, CommonNo, "no"), +#endif // SLIT + +#ifndef NOCLOBBER + i18n(CommonSet, CommonYes, "yes"), +#else // !NOCLOBBER + i18n(CommonSet, CommonNo, "no"), +#endif // NOCLOBBER + #ifdef ORDEREDPSEUDO i18n(CommonSet, CommonYes, "yes") #else // !ORDEREDPSEUDO @@ -104,7 +119,7 @@ int main(int argc, char **argv) { char *rc_file = (char *) 0; char *menu_file = (char *) 0; - i18n.openCatalog("blackbox.cat"); + i18n.openCatalog("openbox.cat"); for (int i = 1; i < argc; ++i) { if (! strcmp(argv[i], "-rc")) { @@ -154,8 +169,9 @@ int main(int argc, char **argv) { } } else if (! strcmp(argv[i], "-version")) { // print current version string - printf("Blackbox %s : (c) 2001 - 2002 Sean 'Shaleh' Perry\n", - "\t\t\t 1997 - 2000 Brad Hughes\n" + printf("Openbox %s : (c) 2002 - 2002 Ben Jansens\n" + " 2001 - 2002 Sean 'Shaleh' Perry\n" + " 1997 - 2000, 2002 Brad Hughes\n\n", __openbox_version); ::exit(0);