X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.h;h=ab1619f97e7372a30b189ec50a4817141ad1ee43;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=15bb2ef63629304c35d3d0656416b1a117fc3fb9;hpb=042d5a024251a9eae85814b2d5fa84eca4bf62dc;p=lyx.git

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 15bb2ef636..ab1619f97e 100644
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,50 +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 {
-	class Session;
-}
 
+extern bool use_gui;
+
+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_gui::exec()
-	 * -# LyX::exec2()
-	 * Step 3 is omitted if no gui is wanted. We need lyx_gui::exec()
+	 * -# lyx::createApplication()
+	 * 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 void exec(int & argc, char * argv[]);
-	/// Execute LyX (inner execution loop, \sa exec)
-	void 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;
 
-	lyx::Session & session();
-	lyx::Session const & session() 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;
+	///
+	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;
+
+	///
+	kb_keymap & topLevelKeymap();
+	kb_keymap const & topLevelKeymap() const;
+
+	///
+	IconvProcessor & iconvProcessor();
 
-	void addLyXView(boost::shared_ptr<LyXView> const & lyxview);
+	LyXView * newLyXView();
 
 	/** redraw \c inset in all the BufferViews in which it is currently
 	 *  visible. If successful return a pointer to the owning Buffer.
@@ -66,13 +106,28 @@ 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();
-	void 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
-	void init();
+	bool init();
 	/// set up the default key bindings
 	void defaultKeyBindings(kb_keymap * kbmap);
 	/// set up the default dead key bindings if requested
@@ -85,15 +140,15 @@ 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);
-	/// parsing of non-gui LyX options. Returns true if gui
-	bool easyParse(int & argc, char * argv[]);
+	bool readEncodingsFile(std::string const & name);
+	/// parsing of non-gui LyX options.
+	void easyParse(int & argc, char * argv[]);
 	/// shows up a parsing error on screen
 	void printError(ErrorItem const &);
 
@@ -102,11 +157,14 @@ private:
 	/// 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_;
+	/// Use the Pimpl idiom to hide the internals.
+	struct Singletons;
+	boost::scoped_ptr<Singletons> pimpl_;
+
 	///
-	typedef std::list<boost::shared_ptr<LyXView> > ViewList;
-	ViewList views_;
+	bool geometryOption_;
 };
 
+} // namespace lyx
+
 #endif // LYX_MAIN_H