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 <string>\t\tuse display connection.\n"
" -rc <string>\t\t\tuse alternate resource file.\n"
+ " -menu <string>\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);
int main(int argc, char **argv) {
char *session_display = (char *) 0;
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")) {
}
rc_file = argv[i];
+ } else if (! strcmp(argv[i], "-menu")) {
+ // look for alternative menu file to use
+
+ if ((++i) >= argc) {
+ fprintf(stderr,
+ i18n(mainSet, mainMENURequiresArg,
+ "error: '-menu' requires and argument\n"));
+
+ ::exit(1);
+ }
+
+ menu_file = argv[i];
} else if (! strcmp(argv[i], "-display")) {
// check for -display option... to run on a display other than the one
// set by the environment variable DISPLAY
}
} 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"
- __blackbox_version);
+ 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);
} else if (! strcmp(argv[i], "-help")) {
_chdir2(getenv("X11ROOT"));
#endif // __EMX__
- Blackbox blackbox(argv, session_display, rc_file);
+ Blackbox blackbox(argv, session_display, rc_file, menu_file);
blackbox.eventLoop();
return(0);