minimal effort implementation of:

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index c9cdf781bf96875eccc1c651b02a82a508131a41..55fdd631b6e63258da3d4d1a11092d09b6b987f9 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,47 +15,83 @@
 #define LYX_MAIN_H
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
+#include <list>
 #include <string>
 
-
-class ErrorItem;
-class LyXRC;
-class LastFiles;
 class Buffer;
+class ErrorItem;
+class InsetBase;
+class LyXView;
 class kb_keymap;
-
-
-/// last files loaded
-extern boost::scoped_ptr<LastFiles> lastfiles;
+namespace lyx {
+       class Session;
+}
 
 
 /// initial startup
 class LyX : boost::noncopyable {
 public:
-       LyX(int & argc, char * argv[]);
+       /**
+        * Execute LyX. The startup sequence is as follows:
+        * -# LyX::exec()
+        * -# LyX::priv_exec()
+        * -# lyx_gui::exec()
+        * -# LyX::exec2()
+        * Step 3 is omitted if no gui is wanted. We need lyx_gui::exec()
+        * 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[]);
+       static LyX & ref();
+       static LyX const & cref();
 
        /// in the case of failure
-       static void emergencyCleanup();
+       void emergencyCleanup() const;
+
+       lyx::Session & session();
+       lyx::Session const & session() const;
+
+       void addLyXView(LyXView * lyxview);
+
+       /** redraw \c inset in all the BufferViews in which it is currently
+        *  visible. If successful return a pointer to the owning Buffer.
+        */
+       Buffer const * const updateInset(InsetBase const *) const;
 
 private:
+       static boost::scoped_ptr<LyX> singleton_;
+
+       LyX();
+       int priv_exec(int & argc, char * argv[]);
+
        /// initial LyX set up
-       void init(bool);
+       bool init();
        /// set up the default key bindings
        void defaultKeyBindings(kb_keymap * kbmap);
        /// set up the default dead key bindings if requested
        void deadKeyBindings(kb_keymap * kbmap);
-       /// check, set up and configure the user dir if necessary
-       void queryUserLyXDir(bool explicit_userdir);
+       /** Check for the existence of the user's support directory and,
+        *  if not present, create it. Exits the program if the directory
+        *  cannot be created.
+        *  \returns true if the user-side configuration script
+        *  (lib/configure) should be re-run in this directory.
+        */
+       bool queryUserLyXDir(bool explicit_userdir);
        /// read lyxrc/preferences
-       void readRcFile(std::string const & name);
+       bool readRcFile(std::string const & name);
        /// read the given ui (menu/toolbar) file
-       void readUIFile(std::string const & name);
+       bool readUIFile(std::string const & name);
        /// read the given languages file
-       void readLanguagesFile(std::string const & name);
+       bool readLanguagesFile(std::string const & name);
        /// read the given encodings file
-       void readEncodingsFile(std::string const & name);
+       bool readEncodingsFile(std::string const & name);
        /// parsing of non-gui LyX options. Returns true if gui
        bool easyParse(int & argc, char * argv[]);
        /// shows up a parsing error on screen
@@ -65,6 +101,16 @@ private:
        bool first_start;
        /// the parsed command line batch command if any
        std::string batch_command;
+
+       /// lyx session, containing lastfiles, lastfilepos, and lastopened
+       boost::scoped_ptr<lyx::Session> session_;
+       ///
+       typedef std::list<LyXView *> ViewList;
+       ViewList views_;
+
+       ///
+       bool geometryOption_;
+
 };
 
 #endif // LYX_MAIN_H