X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=83cbf516103d5fbb5bfe195b76b34590e6665200;hb=1da8531a7b4eea22592b6d0760352d2a34e9b6b0;hp=3bab740af93c3f78dd70dfe321755d6084eb2459;hpb=f25252a4849ab205856629480178946b2b454aa3;p=chaz%2Fopenbox

diff --git a/src/main.cc b/src/main.cc
index 3bab740a..83cbf516 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 /*! @file main.cc
   @brief Main entry point for the application
@@ -9,26 +9,50 @@
 #endif // HAVE_CONFIG_H
 
 extern "C" {
+#ifdef    HAVE_LOCALE_H
+# include <locale.h>
+#endif // HAVE_LOCALE_H
+
+#ifdef    HAVE_STDIO_H
+# include <stdio.h>
+#endif // HAVE_STDIO_H
+
+#ifdef    HAVE_UNISTD_H
+#  include <sys/types.h>
+#  include <unistd.h>
+#endif // HAVE_UNISTD_H
+
 #include "gettext.h"
 }
 
-#include <string>
-using std::string;
-
-#include "blackbox.hh"
 #include "openbox.hh"
+#include "otk/util.hh"
 
 int main(int argc, char **argv) {
   // initialize the locale
-  setlocale(LC_ALL, "");
+  if (!setlocale(LC_ALL, ""))
+    printf("Couldn't set locale from environment.\n");
   bindtextdomain(PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset(PACKAGE, "UTF-8");
   textdomain(PACKAGE);
 
-  //ob::Openbox openbox(argc, argv);
-  ob::Blackbox blackbox(argc, argv, 0);
-  
-  //Blackbox blackbox(argv, session_display, rc_file);
-  blackbox.eventLoop();
-
-  return(0);
+  ob::Openbox *openbox = new ob::Openbox(argc, argv);
+  openbox->eventLoop();
+
+  if (openbox->doRestart()) {
+    std::string prog = openbox->restartProgram();
+
+    delete openbox; // shutdown the current one!
+    
+    if (!prog.empty()) {
+      execl("/bin/sh", "/bin/sh", "-c", prog.c_str(), NULL); 
+      perror(prog.c_str());
+    }
+    
+    // fall back in case the above execlp doesn't work
+    execvp(argv[0], argv);
+    execvp(otk::basename(argv[0]).c_str(), argv);
+  }
+
+  delete openbox; // shutdown
 }