X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=e59749aa6cfc22184a7e05f975f3b3626d53241b;hb=ba87284397e058fc477a04fba2ff2eb815a33de0;hp=af0dcf38b4b6dacf5fdf00d13faef7dbeb92b763;hpb=ace8c8896aa13a6fc4e489277cf9c96f49175322;p=chaz%2Fopenbox

diff --git a/src/main.cc b/src/main.cc
index af0dcf38..e59749aa 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,30 +1,53 @@
-// -*- 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
+*/
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"
 #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();
+  ob::Openbox openbox(argc, argv);
+  openbox.eventLoop();
 
-  return(0);
+  if (openbox.doRestart()) {
+    const std::string &prog = openbox.restartProgram();
+    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);
+  }
 }