X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=5d878d79c7f0053e6d9425c55240d4e523dd6b0b;hb=bf49e7642027f576716e5742544c282f4396f9ef;hp=af0dcf38b4b6dacf5fdf00d13faef7dbeb92b763;hpb=ace8c8896aa13a6fc4e489277cf9c96f49175322;p=chaz%2Fopenbox diff --git a/src/main.cc b/src/main.cc index af0dcf38..5d878d79 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,10 +1,20 @@ // -*- mode: C++; indent-tabs-mode: nil; -*- +/*! @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 +#endif // HAVE_LOCALE_H + +#include + #include "gettext.h" } @@ -14,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); - blackbox.eventLoop(); - - return(0); + // start up guile + //gh_enter(argc, argv, main_prog); + main_prog(argc, argv); }