1 files changed, 43 insertions, 72 deletions

diff --git a/src/main.cc b/src/main.cc
index 2eb0ff0..183983f 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: main.cc,v 1.14 2003/04/27 01:51:04 fluxgen Exp $
+// $Id: main.cc,v 1.15 2003/05/07 22:19:59 fluxgen Exp $
 
 
 
@@ -58,35 +58,10 @@
 
 using namespace std;
 
-#ifdef DEBUG_UDS
-
-#include <uds/init.hh>
-#include <uds/uds.hh>
-
-// configure UDS
-uds::uds_flags_t uds::flags = uds::leak_check | uds::std_backtraces | uds::log_allocs | uds::leak_check;
-
-#endif //!DEBUG_UDS
-
-const char *getNLSYesNoMsg(bool val) {
-    if (val) {
-        return I18n::instance()->getMessage(
-            FBNLS::CommonSet, FBNLS::CommonYes,
-            "yes");
-    }
-        
-    return I18n::instance()->getMessage(
-        FBNLS::CommonSet, FBNLS::CommonNo,
-        "no");
-}
-
 int main(int argc, char **argv) {
-#ifdef DEBUG_UDS
-    uds::Init uds_init;
-#endif //!DEBUG_UDS
         
-    char *session_display = (char *) 0;
-    char *rc_file = (char *) 0;
+    char *session_display = 0;
+    char *rc_file = 0;
 
     NLSInit("fluxbox.cat");
     I18n *i18n = I18n::instance();
@@ -129,70 +104,66 @@ int main(int argc, char **argv) {
                                    "warning: couldn't set environment variable 'DISPLAY'\n"));
                 perror("putenv()");
             }
-        } else if (strcmp(argv[i], "-version") == 0) {
+        } else if (strcmp(argv[i], "-version") == 0 || strcmp(argv[i], "-v") == 0) {
             // print current version string
-            printf("Fluxbox %s : (c) 2001-2002 Henrik Kinnunen \n\n",
+            printf("Fluxbox %s : (c) 2001-2003 Henrik Kinnunen \n\n",
                    __fluxbox_version);
             exit(0);
-        } else if (strcmp(argv[i], "-help") == 0) {
+        } else if (strcmp(argv[i], "-help") == 0 || strcmp(argv[i], "-h") == 0) {
             // print program usage and command line options
             printf(i18n->
                    getMessage(
                               FBNLS::mainSet, FBNLS::mainUsage,
-                              "Fluxbox %s : (c) 2001-2002 Henrik Kinnunen\n\n"
+                              "Fluxbox %s : (c) 2001-2003 Henrik Kinnunen\n\n"
                               " -display <string>\t\tuse display connection.\n"
                               " -rc <string>\t\t\tuse alternate resource file.\n"
                               " -version\t\t\tdisplay version and exit.\n"
                               " -help\t\t\t\tdisplay this help text and exit.\n\n"),
                    __fluxbox_version);
 
-
-            printf(i18n->
-                   getMessage(
-                              FBNLS::mainSet, FBNLS::mainCompileOptions,
-                              "Compile time options:\n"
-                              " Debugging:\t\t\t%s\n"
-                              " Interlacing:\t\t\t%s\n"
-                              " Shape:\t\t\t%s\n"
-                              " Slit:\t\t\t\t%s\n"
-                              " 8bpp Ordered Dithering:\t%s\n\n"),
+            cout<<"Compiled with: "<<endl<<
 #ifdef DEBUG
-                   getNLSYesNoMsg(true),
-#else // !DEBUG
-                   getNLSYesNoMsg(false),
-#endif // DEBUG
-
-#ifdef INTERLACE
-                   getNLSYesNoMsg(true),
-#else // !INTERLACE
-                   getNLSYesNoMsg(false),
-#endif // INTERLACE
-
-#ifdef SHAPE
-                   getNLSYesNoMsg(true),
-#else // !SHAPE
-                   getNLSYesNoMsg(false),
-#endif // SHAPE
-
+                "DEBUG"<<endl<<
+#endif // DEBUG                
 #ifdef SLIT
-                   getNLSYesNoMsg(true),
-#else // !SLIT
-                   getNLSYesNoMsg(false),
+                "SLIT"<<endl<<
 #endif // SLIT
-
-#ifdef          ORDEREDPSEUDO
-                   getNLSYesNoMsg(true)
-#else // !ORDEREDPSEUDO
-                   getNLSYesNoMsg(false)
-#endif // ORDEREDPSEUDO
-
-                   );
-
+#ifdef HAVE_XPM
+                "XPM"<<endl<<
+#endif // HAVE_XPM
+#ifdef USE_GNOME
+                "GNOME"<<endl<<
+#endif // USE_GNOME 
+#ifdef KDE
+                "KDE"<<endl<<
+#endif // KDE
+#ifdef USE_NEWWMSPEC
+                "EWMH"<<endl<<
+#endif // USE_NEWWMSPEC
+#ifdef REMEMBER
+                "REMEMBER"<<endl<<
+#endif // REMEMBER
+#ifdef SHAPE
+                "SHAPE"<<endl<<
+#endif // SHAPE
+#ifdef USE_XFT
+                "XFT"<<endl<<
+#endif // USE_XFT
+#ifdef USE_XMB
+                "XMB"<<endl<<
+#endif // USE_XMB
+#ifdef XINERAMA
+                "XINERAMA"<<endl<<
+#endif // XINERAMA
+#ifdef HAVE_XRENDER
+                "RENDER"<<endl<<
+#endif // HAVE_XRENDER
+                endl;
             ::exit(0);
         }
     }
 
-#ifdef          __EMX__
+#ifdef __EMX__
     _chdir2(getenv("X11ROOT"));
 #endif // __EMX__
     Fluxbox *fluxbox=0;