@brief Main entry point for the application
*/
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "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>
#include "openbox.hh"
#include "otk/util.hh"
+#include <clocale>
+#include <cstdio>
+
int main(int argc, char **argv) {
// initialize the locale
if (!setlocale(LC_ALL, ""))
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
- ob::Openbox openbox(argc, argv);
- openbox.eventLoop();
+ ob::Openbox *openbox = new ob::Openbox(argc, argv);
+ openbox->eventLoop();
- if (openbox.doRestart()) {
- const std::string &prog = openbox.restartProgram();
+ 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());
execvp(argv[0], argv);
execvp(otk::basename(argv[0]).c_str(), argv);
}
+
+ delete openbox; // shutdown
}