* Painter.h:

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 7ea348c4417e315dfb7f3beb21a6df33efbe25b0..944d2c12f091e5c8f857a33e71feba6f612e8a1d 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,26 +15,27 @@
 #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 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 {
@@ -60,14 +61,38 @@ public:
        /// 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;
+
+       ///
+       frontend::Application & application();
+       frontend::Application const & application() const;
 
-       void addLyXView(LyXView * lyxview);
+       ///
+       kb_keymap & topLevelKeymap();
+       kb_keymap const & topLevelKeymap() const;
+
+       LyXView * newLyXView();
 
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
@@ -80,6 +105,26 @@ private:
        LyX();
        int priv_exec(int & argc, char * argv[]);
 
+       /// Do some cleanup in preparation of an exit.
+       void prepareExit();
+
+       /// 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();
        /// set up the default key bindings
@@ -111,19 +156,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