X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=f192c0a191fe4f771e38f4cee57a52dfba9390aa;hb=d181f1ad05332c42eb090384666171a142f54b0c;hp=946f56407e6e8ff24a6f633f50e477825af1eefb;hpb=f992b34c7d4afe496f1391edfd33ea661211a670;p=chaz%2Fopenbox

diff --git a/src/main.cc b/src/main.cc
index 946f5640..f192c0a1 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -61,10 +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 <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);
@@ -75,6 +77,8 @@ static void showHelp(int exitval) {
               "Compile time options:\n"
               "  Debugging:\t\t\t%s\n"
               "  Shape:\t\t\t%s\n"
+              "  Xft:\t\t\t\t%s\n"
+              "  Xinerama:\t\t\t%s\n"
               "  8bpp Ordered Dithering:\t%s\n\n"),
 #ifdef    DEBUG
          i18n(CommonSet, CommonYes, "yes"),
@@ -88,6 +92,18 @@ static void showHelp(int exitval) {
          i18n(CommonSet, CommonNo, "no"),
 #endif // SHAPE
 
+#ifdef    XFT
+         i18n(CommonSet, CommonYes, "yes"),
+#else // !XFT
+         i18n(CommonSet, CommonNo, "no"),
+#endif // XFT
+
+#ifdef    XINERAMA
+         i18n(CommonSet, CommonYes, "yes"),
+#else // !XINERAMA
+         i18n(CommonSet, CommonNo, "no"),
+#endif // XINERAMA
+
 #ifdef    ORDEREDPSEUDO
          i18n(CommonSet, CommonYes, "yes")
 #else // !ORDEREDPSEUDO
@@ -101,8 +117,9 @@ static void showHelp(int exitval) {
 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")) {
@@ -117,6 +134,18 @@ int main(int argc, char **argv) {
       }
 
       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
@@ -140,9 +169,10 @@ 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"
-             __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")) {
@@ -156,7 +186,7 @@ int main(int argc, char **argv) {
   _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);