Merged pull request #1842

apps/opencs/main.cpp

@@ -8,8 +8,9 @@
 #include <QIcon>
 #include <QMetaType>
 
-#include "model/doc/messages.hpp"
+#include <components/misc/debugging.hpp>
 
+#include "model/doc/messages.hpp"
 #include "model/world/universalid.hpp"
 
 #ifdef Q_OS_MAC
@@ -41,45 +42,43 @@ class Application : public QApplication
         Application (int& argc, char *argv[]) : QApplication (argc, argv) {}
 };
 
-int main(int argc, char *argv[])
+int runApplication(int argc, char *argv[])
 {
-    #ifdef Q_OS_MAC
+#ifdef Q_OS_MAC
-        setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
+    setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
-    #endif
+#endif
 
-    try
+    // To allow background thread drawing in OSG
-    {           
+    QApplication::setAttribute(Qt::AA_X11InitThreads, true);
-        // To allow background thread drawing in OSG
-        QApplication::setAttribute(Qt::AA_X11InitThreads, true);
 
-        Q_INIT_RESOURCE (resources);
+    Q_INIT_RESOURCE (resources);
 
-        qRegisterMetaType<std::string> ("std::string");
+    qRegisterMetaType<std::string> ("std::string");
-        qRegisterMetaType<CSMWorld::UniversalId> ("CSMWorld::UniversalId");
+    qRegisterMetaType<CSMWorld::UniversalId> ("CSMWorld::UniversalId");
-        qRegisterMetaType<CSMDoc::Message> ("CSMDoc::Message");
+    qRegisterMetaType<CSMDoc::Message> ("CSMDoc::Message");
 
-        Application application (argc, argv);
+    Application application (argc, argv);
 
-    #ifdef Q_OS_MAC
+#ifdef Q_OS_MAC
-        QDir dir(QCoreApplication::applicationDirPath());
+    QDir dir(QCoreApplication::applicationDirPath());
-        QDir::setCurrent(dir.absolutePath());
+    QDir::setCurrent(dir.absolutePath());
-    #endif
+#endif
 
-        application.setWindowIcon (QIcon (":./openmw-cs.png"));
+    application.setWindowIcon (QIcon (":./openmw-cs.png"));
 
-        CS::Editor editor(argc, argv);
+    CS::Editor editor(argc, argv);
 
-        if(!editor.makeIPCServer())
+    if(!editor.makeIPCServer())
-        {
-            editor.connectToIPCServer();
-            return 0;
-        }
-        return editor.run();
-    }
-    catch (std::exception& e)
     {
-        std::cerr << "ERROR: " << e.what() << std::endl;
+        editor.connectToIPCServer();
         return 0;
     }
 
+    return editor.run();
+}
+
+
+int main(int argc, char *argv[])
+{
+    return wrapApplication(&runApplication, argc, argv, "/openmw-cs.log");
 }

apps/openmw/main.cpp

@@ -5,12 +5,10 @@
 #include <components/files/configurationmanager.hpp>
 #include <components/files/escape.hpp>
 #include <components/fallback/validate.hpp>
+#include <components/misc/debugging.hpp>
 
-#include <SDL_messagebox.h>
 #include "engine.hpp"
 
-#include <boost/filesystem/fstream.hpp>
-
 #if defined(_WIN32)
 // For OutputDebugString
 #ifndef WIN32_LEAN_AND_MEAN
@@ -241,43 +239,25 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     return true;
 }
 
-#if defined(_WIN32) && defined(_DEBUG)
+int runApplication(int argc, char *argv[])
-
-class DebugOutput : public boost::iostreams::sink
-{
-public:
-    std::streamsize write(const char *str, std::streamsize size)
-    {
-        // Make a copy for null termination
-        std::string tmp (str, static_cast<unsigned int>(size));
-        // Write string to Visual Studio Debug output
-        OutputDebugString (tmp.c_str ());
-        return size;
-    }
-};
-#else
-class Tee : public boost::iostreams::sink
 {
-public:
+#ifdef __APPLE__
-    Tee(std::ostream &stream, std::ostream &stream2)
+    boost::filesystem::path binary_path = boost::filesystem::system_complete(boost::filesystem::path(argv[0]));
-        : out(stream), out2(stream2)
+    boost::filesystem::current_path(binary_path.parent_path());
-    {
+    setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
-    }
+#endif
 
-    std::streamsize write(const char *str, std::streamsize size)
+    Files::ConfigurationManager cfgMgr;
+    std::unique_ptr<OMW::Engine> engine;
+    engine.reset(new OMW::Engine(cfgMgr));
+
+    if (parseOptions(argc, argv, *engine, cfgMgr))
     {
-        out.write (str, size);
+        engine->go();
-        out.flush();
-        out2.write (str, size);
-        out2.flush();
-        return size;
     }
 
-private:
+    return 0;
-    std::ostream &out;
+}
-    std::ostream &out2;
-};
-#endif
 
 #ifdef ANDROID
 extern "C" int SDL_main(int argc, char**argv)
@@ -285,80 +265,7 @@ extern "C" int SDL_main(int argc, char**argv)
 int main(int argc, char**argv)
 #endif
 {
-#if defined(__APPLE__)
+    return wrapApplication(&runApplication, argc, argv, "/openmw.log");
-    setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
-#endif
-
-    // Some objects used to redirect cout and cerr
-    // Scope must be here, so this still works inside the catch block for logging exceptions
-    std::streambuf* cout_rdbuf = std::cout.rdbuf ();
-    std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
-
-#if !(defined(_WIN32) && defined(_DEBUG))
-    boost::iostreams::stream_buffer<Tee> coutsb;
-    boost::iostreams::stream_buffer<Tee> cerrsb;
-#endif
-
-    std::ostream oldcout(cout_rdbuf);
-    std::ostream oldcerr(cerr_rdbuf);
-
-    boost::filesystem::ofstream logfile;
-
-    std::unique_ptr<OMW::Engine> engine;
-
-    int ret = 0;
-    try
-    {
-        Files::ConfigurationManager cfgMgr;
-
-#if defined(_WIN32) && defined(_DEBUG)
-        // Redirect cout and cerr to VS debug output when running in debug mode
-        boost::iostreams::stream_buffer<DebugOutput> sb;
-        sb.open(DebugOutput());
-        std::cout.rdbuf (&sb);
-        std::cerr.rdbuf (&sb);
-#else
-        // Redirect cout and cerr to openmw.log
-        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / "/openmw.log"));
-
-        coutsb.open (Tee(logfile, oldcout));
-        cerrsb.open (Tee(logfile, oldcerr));
-
-        std::cout.rdbuf (&coutsb);
-        std::cerr.rdbuf (&cerrsb);
-#endif
-
-        crashCatcherInstall(argc, argv, (cfgMgr.getLogPath() / "crash.log").string());
-
-#ifdef __APPLE__
-        boost::filesystem::path binary_path = boost::filesystem::system_complete(boost::filesystem::path(argv[0]));
-        boost::filesystem::current_path(binary_path.parent_path());
-#endif
-
-        engine.reset(new OMW::Engine(cfgMgr));
-
-        if (parseOptions(argc, argv, *engine, cfgMgr))
-        {
-            engine->go();
-        }
-    }
-    catch (std::exception &e)
-    {
-#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
-        if (!isatty(fileno(stdin)))
-#endif
-            SDL_ShowSimpleMessageBox(0, "OpenMW: Fatal error", e.what(), NULL);
-
-        std::cerr << "\nERROR: " << e.what() << std::endl;
-
-        ret = 1;
-    }
-
-    // Restore cout and cerr
-    std::cout.rdbuf(cout_rdbuf);
-    std::cerr.rdbuf(cerr_rdbuf);
-
-    return ret;
 }
 
 // Platform specific for Windows when there is no console built into the executable.

components/CMakeLists.txt

@@ -85,7 +85,7 @@ add_component_dir (esmterrain
     )
 
 add_component_dir (misc
-    utf8stream stringops resourcehelpers rng messageformatparser
+    utf8stream stringops resourcehelpers rng debugging messageformatparser
     )
 
 IF(NOT WIN32 AND NOT APPLE)

components/misc/debugging.hpp

@@ -0,0 +1,112 @@
+#ifndef MISC_DEBUGGING_H
+#define MISC_DEBUGGING_H
+
+#include <boost/filesystem/fstream.hpp>
+#include <boost/iostreams/stream.hpp>
+
+#include <SDL_messagebox.h>
+
+namespace Misc
+{
+#if defined(_WIN32) && defined(_DEBUG)
+
+    class DebugOutput : public boost::iostreams::sink
+    {
+    public:
+        std::streamsize write(const char *str, std::streamsize size)
+        {
+            // Make a copy for null termination
+            std::string tmp (str, static_cast<unsigned int>(size));
+            // Write string to Visual Studio Debug output
+            OutputDebugString (tmp.c_str ());
+            return size;
+        }
+    };
+#else
+    class Tee : public boost::iostreams::sink
+    {
+    public:
+        Tee(std::ostream &stream, std::ostream &stream2)
+            : out(stream), out2(stream2)
+        {
+        }
+
+        std::streamsize write(const char *str, std::streamsize size)
+        {
+            out.write (str, size);
+            out.flush();
+            out2.write (str, size);
+            out2.flush();
+            return size;
+        }
+
+    private:
+        std::ostream &out;
+        std::ostream &out2;
+    };
+#endif
+}
+
+int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[], const std::string& logName)
+{
+    // Some objects used to redirect cout and cerr
+    // Scope must be here, so this still works inside the catch block for logging exceptions
+    std::streambuf* cout_rdbuf = std::cout.rdbuf ();
+    std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
+
+#if !(defined(_WIN32) && defined(_DEBUG))
+    boost::iostreams::stream_buffer<Misc::Tee> coutsb;
+    boost::iostreams::stream_buffer<Misc::Tee> cerrsb;
+#endif
+
+    std::ostream oldcout(cout_rdbuf);
+    std::ostream oldcerr(cerr_rdbuf);
+
+    boost::filesystem::ofstream logfile;
+
+    int ret = 0;
+    try
+    {
+        Files::ConfigurationManager cfgMgr;
+#if defined(_WIN32) && defined(_DEBUG)
+        // Redirect cout and cerr to VS debug output when running in debug mode
+        boost::iostreams::stream_buffer<Misc::DebugOutput> sb;
+        sb.open(Misc::DebugOutput());
+        std::cout.rdbuf (&sb);
+        std::cerr.rdbuf (&sb);
+#else
+        // Redirect cout and cerr to the log file
+        boost::filesystem::ofstream logfile;
+        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName));
+
+        std::ostream oldcout(cout_rdbuf);
+        std::ostream oldcerr(cerr_rdbuf);
+
+        coutsb.open (Misc::Tee(logfile, oldcout));
+        cerrsb.open (Misc::Tee(logfile, oldcerr));
+
+        std::cout.rdbuf (&coutsb);
+        std::cerr.rdbuf (&cerrsb);
+#endif
+        ret = innerApplication(argc, argv);
+    }
+    catch (std::exception& e)
+    {
+#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
+        if (!isatty(fileno(stdin)))
+#endif
+            SDL_ShowSimpleMessageBox(0, "OpenMW: Fatal error", e.what(), NULL);
+
+        std::cerr << "\nERROR: " << e.what() << std::endl;
+
+        ret = 1;
+    }
+
+    // Restore cout and cerr
+    std::cout.rdbuf(cout_rdbuf);
+    std::cerr.rdbuf(cerr_rdbuf);
+
+    return ret;
+}
+
+#endif