X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=5d878d79c7f0053e6d9425c55240d4e523dd6b0b;hb=bf49e7642027f576716e5742544c282f4396f9ef;hp=6b131b92078c681389cd6689eb07d0737928ab34;hpb=cee305244662d352a7ad5ab7ae22f6221c064d3d;p=chaz%2Fopenbox diff --git a/src/main.cc b/src/main.cc index 6b131b92..5d878d79 100644 --- a/src/main.cc +++ b/src/main.cc @@ -9,6 +9,12 @@ #endif // HAVE_CONFIG_H extern "C" { +#ifdef HAVE_LOCALE_H +# include +#endif // HAVE_LOCALE_H + +#include + #include "gettext.h" } @@ -18,17 +24,21 @@ using std::string; #include "blackbox.hh" #include "openbox.hh" +void main_prog(int argc, char **argv) { + ob::Openbox openbox(argc, argv); + //ob::Blackbox blackbox(argc, argv, 0); + + //Blackbox blackbox(argv, session_display, rc_file); + openbox.eventLoop(); +} + int main(int argc, char **argv) { // initialize the locale setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - ob::Openbox openbox(argc, argv); - //ob::Blackbox blackbox(argc, argv, 0); - - //Blackbox blackbox(argv, session_display, rc_file); - openbox.eventLoop(); - - return(0); + // start up guile + //gh_enter(argc, argv, main_prog); + main_prog(argc, argv); }