we rely on Windows and maybe Linux on a Qt bug

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 7ea348c4417e315dfb7f3beb21a6df33efbe25b0..ab1619f97e7372a30b189ec50a4817141ad1ee43 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,59 +15,90 @@
 #define LYX_MAIN_H
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
-#include <list>
 #include <string>
+#include <vector>
+
+namespace lyx {
 
 class Buffer;
 class BufferList;
 class ErrorItem;
+class IconvProcessor;
 class InsetBase;
+class LyXFunc;
+class LyXServer;
+class LyXServerSocket;
 class LyXView;
+class Session;
 class kb_keymap;
 
-namespace lyx {
 extern bool use_gui;
-class Session;
-namespace frontend {
-class Application;
-}
-}
+
+namespace frontend { class Application; }
 
 /// initial startup
 class LyX : boost::noncopyable {
 public:
+
+       LyX();
+       ~LyX();
+
        /**
         * Execute LyX. The startup sequence is as follows:
         * -# LyX::exec()
         * -# LyX::priv_exec()
         * -# lyx::createApplication()
-        * -# LyX::exec2()
         * Step 3 is omitted if no gui is wanted. We need lyx::createApplication()
         * only to create the QApplication object in the qt frontend. All
         * attempts with static and dynamically allocated QApplication
         * objects lead either to harmless error messages on exit
         * ("Mutex destroy failure") or crashes (OS X).
         */
-       static int exec(int & argc, char * argv[]);
-       /// Execute LyX (inner execution loop, \sa exec)
-       int exec2(int & argc, char * argv[]);
+       int exec(int & argc, char * argv[]);
+
        static LyX & ref();
        static LyX const & cref();
 
        /// in the case of failure
        void emergencyCleanup() const;
 
+       /// Ask the LyX class to exit.
+       /**
+       In GUI mode, after this function has been called, application_ leaves
+       the main event loop and returns from the call to Application::start().
+       */
+       void quit();
+
        ///
        BufferList & bufferList();
        BufferList const & bufferList() const;
        ///
-       lyx::Session & session();
-       lyx::Session const & session() const;
+       Session & session();
+       Session const & session() const;
+       ///
+       LyXFunc & lyxFunc();
+       LyXFunc const & lyxFunc() const;
+       ///
+       LyXServer & server();
+       LyXServer const & server() const;
+       ///
+       LyXServerSocket & socket();
+       LyXServerSocket const & socket() const;
 
-       void addLyXView(LyXView * lyxview);
+       ///
+       frontend::Application & application();
+       frontend::Application const & application() const;
+
+       ///
+       kb_keymap & topLevelKeymap();
+       kb_keymap const & topLevelKeymap() const;
+
+       ///
+       IconvProcessor & iconvProcessor();
+
+       LyXView * newLyXView();
 
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
@@ -75,10 +106,25 @@ public:
        Buffer const * const updateInset(InsetBase const *) const;
 
 private:
-       static boost::scoped_ptr<LyX> singleton_;
+       /// Do some cleanup in preparation of an exit.
+       void prepareExit();
 
-       LyX();
-       int priv_exec(int & argc, char * argv[]);
+       /// Early exit during the initialisation process.
+       void earlyExit(int status);
+
+       /// Initialise LyX and execute batch commands if available.
+       /**
+       \param files is filled in with the command-line file names.
+       \return exit code failure if any.
+       */
+       int execBatchCommands(int & argc, char * argv[],
+               std::vector<std::string> & files);
+
+       /// Create a View and restore GUI Session.
+       void restoreGuiSession(std::vector<std::string> const & files);
+
+       /// Initialize RC font for the GUI.
+       void initGuiFont();
 
        /// initial LyX set up
        bool init();
@@ -111,19 +157,14 @@ private:
        /// the parsed command line batch command if any
        std::string batch_command;
 
-       ///
-       boost::scoped_ptr<BufferList> buffer_list_;
-       /// lyx session, containing lastfiles, lastfilepos, and lastopened
-       boost::scoped_ptr<lyx::Session> session_;
-       ///
-       typedef std::list<LyXView *> ViewList;
-       ViewList views_;
+       /// Use the Pimpl idiom to hide the internals.
+       struct Singletons;
+       boost::scoped_ptr<Singletons> pimpl_;
 
        ///
        bool geometryOption_;
-
-       ///
-       boost::scoped_ptr<lyx::frontend::Application> application_;
 };
 
+} // namespace lyx
+
 #endif // LYX_MAIN_H