minimal effort implementation of:

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 426a7810ee6e7355ac45623154ab0ef4a627cca2..55fdd631b6e63258da3d4d1a11092d09b6b987f9 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -34,7 +34,21 @@ namespace lyx {
 /// initial startup
 class LyX : boost::noncopyable {
 public:
-       static void exec(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();
 
@@ -44,7 +58,7 @@ public:
        lyx::Session & session();
        lyx::Session const & session() const;
 
-       void addLyXView(boost::shared_ptr<LyXView> const & lyxview);
+       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.
@@ -55,10 +69,10 @@ private:
        static boost::scoped_ptr<LyX> singleton_;
 
        LyX();
-       void priv_exec(int & argc, char * argv[]);
+       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
@@ -71,13 +85,13 @@ private:
         */
        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
@@ -91,8 +105,12 @@ private:
        /// lyx session, containing lastfiles, lastfilepos, and lastopened
        boost::scoped_ptr<lyx::Session> session_;
        ///
-       typedef std::list<boost::shared_ptr<LyXView> > ViewList;
+       typedef std::list<LyXView *> ViewList;
        ViewList views_;
+
+       ///
+       bool geometryOption_;
+
 };
 
 #endif // LYX_MAIN_H