X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=ccce7a31549bf1f1099a9db0944f8bc1d4ea87f9;hb=43dd383073fc61cfe5f24b87294c4e8698a1827a;hp=0d8616eff9b98eef606cb2631ec62e76ae1f4049;hpb=8d99df0c933018cf5e63e48a02646877d3f3e66a;p=lyx.git diff --git a/src/LyX.h b/src/LyX.h index 0d8616eff9..ccce7a3154 100644 --- a/src/LyX.h +++ b/src/LyX.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon * @@ -16,102 +16,58 @@ #include "support/strfwd.h" -namespace lyx { +#include -namespace support { -class FileName; -} +namespace lyx { -class Buffer; class BufferList; +class CmdDef; class Converters; +class DispatchResult; class ErrorItem; -class Inset; -class LyXFunc; -class Server; -class ServerSocket; +class FuncRequest; +class FuncStatus; +class KeyMap; +class LaTeXFonts; class Messages; class Mover; class Movers; +class Server; +class ServerSocket; class Session; -class KeyMap; -class CmdDef; +class SpellChecker; + +enum RunMode { + NEW_INSTANCE, + USE_REMOTE, + PREFERRED +}; + +enum OverwriteFiles { + NO_FILES, + MAIN_FILE, + ALL_FILES, + UNSPECIFIED +}; extern bool use_gui; +extern RunMode run_mode; +extern OverwriteFiles force_overwrite; namespace frontend { class Application; -class LyXView; } /// initial startup class LyX { + friend class LyXConsoleApp; public: - LyX(); ~LyX(); /// Execute LyX. int exec(int & argc, char * argv[]); - /// Try to exit LyX properly. - /// \p exit_code is 0 by default, if a non zero value is passed, - /// emergencyCleanup() will be called before exiting. - void exit(int exit_code = 0) const; - - static LyX & ref(); - static LyX const & cref(); - - /// in the case of failure - void emergencyCleanup() const; - - /// - BufferList & bufferList(); - BufferList const & bufferList() const; - /// - Session & session(); - Session const & session() const; - /// - LyXFunc & lyxFunc(); - LyXFunc const & lyxFunc() const; - /// - Server & server(); - Server const & server() const; - /// - ServerSocket & socket(); - ServerSocket const & socket() const; - - /// - frontend::Application & application(); - frontend::Application const & application() const; - - /// - KeyMap & topLevelKeymap(); - KeyMap const & topLevelKeymap() const; - - /// - CmdDef & topLevelCmdDef(); - - /// - Converters & converters(); - Converters & systemConverters(); - - /// - Messages & getMessages(std::string const & language); - /// - Messages & getGuiMessages(); - /// - void setGuiLanguage(std::string const & language); - - /// - frontend::LyXView * newLyXView(); - - /// Execute batch commands if available. - void execBatchCommands(); - - /// - void addFileToLoad(std::string const &); - private: /// noncopyable LyX(LyX const &); @@ -129,16 +85,21 @@ private: */ int init(int & argc, char * argv[]); + /// Execute commandline commands if no GUI was requested. + int execWithoutGui(int & argc, char * argv[]); + + /// Execute batch commands if available. + void execCommands(); + /// Load files passed at command-line. + /// return true on success false if we encounter an error /** This method is used only in non-GUI mode. */ - void loadFiles(); + bool loadFiles(); /// initial LyX set up bool init(); - /// set up the default dead key bindings if requested - void deadKeyBindings(KeyMap * kbmap); /** 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. @@ -147,9 +108,9 @@ private: */ bool queryUserLyXDir(bool explicit_userdir); /// read lyxrc/preferences - bool readRcFile(std::string const & name); - /// read the given ui (menu/toolbar) file - bool readUIFile(std::string const & name, bool include = false); + /// \param check_format: whether to try to convert the format of + /// the file, if there is a mismatch. + bool readRcFile(std::string const & name, bool check_format = false); /// read the given languages file bool readLanguagesFile(std::string const & name); /// read the encodings. @@ -162,6 +123,9 @@ private: /// shows up a parsing error on screen void printError(ErrorItem const &); + /// + Messages & messages(std::string const & language); + /// Use the Pimpl idiom to hide the internals. // Mostly used for singletons. struct Impl; @@ -170,13 +134,52 @@ private: /// has this user started lyx for the first time? bool first_start; + friend FuncStatus getStatus(FuncRequest const & action); + friend void dispatch(FuncRequest const & action); + friend void dispatch(FuncRequest const & action, DispatchResult & dr); + friend std::vector & theFilesToLoad(); + friend BufferList & theBufferList(); + friend Server & theServer(); + friend ServerSocket & theServerSocket(); + friend Converters & theConverters(); + friend Converters & theSystemConverters(); + friend Messages const & getMessages(std::string const & language); + friend Messages const & getGuiMessages(); + friend KeyMap & theTopLevelKeymap(); friend Movers & theMovers(); - friend Mover const & getMover(std::string const & fmt); + friend Mover const & getMover(std::string const & fmt); friend void setMover(std::string const & fmt, std::string const & command); friend Movers & theSystemMovers(); friend frontend::Application * theApp(); + friend Session & theSession(); + friend LaTeXFonts & theLaTeXFonts(); + friend CmdDef & theTopLevelCmdDef(); + friend SpellChecker * theSpellChecker(); + friend void setSpellChecker(); + friend void emergencyCleanup(); + friend void execBatchCommands(); + friend void lyx_exit(int exit_code); }; + +/// in the case of failure +void emergencyCleanup(); +/// Try to exit LyX properly. +/// \p exit_code is 0 by default, if a non zero value is passed, +/// emergencyCleanup() will be called before exiting. +void lyx_exit(int exit_code); +/// Execute batch commands if available. +void execBatchCommands(); + +/// +FuncStatus getStatus(FuncRequest const & action); + +/// +void dispatch(FuncRequest const & action); + +/// +void dispatch(FuncRequest const & action, DispatchResult & dr); + } // namespace lyx #endif // LYX_H