]> git.lyx.org Git - lyx.git/blobdiff - src/LyX.cpp
Some more cleanup of LyXView:
[lyx.git] / src / LyX.cpp
index 1da1328ce08c109c079132332b429c074dbbbeb8..456b47ebf698493d9a55e9fd8373d84751f4bd83 100644 (file)
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Gui.h"
 #include "frontends/LyXView.h"
 
 #include "support/environment.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/convert.h"
 #include "support/ExceptionMessage.h"
 #include "support/os.h"
 #include "support/Package.h"
@@ -149,9 +147,9 @@ void reconfigureUserLyXDir()
 
 
 /// The main application class private implementation.
-struct LyX::Singletons
+struct LyX::Impl
 {
-       Singletons()
+       Impl()
        {
                // Set the default User Interface language as soon as possible.
                // The language used will be derived from the environment
@@ -189,9 +187,13 @@ struct LyX::Singletons
 
        ///
        Movers movers_;
-
        ///
        Movers system_movers_;
+
+       /// has this user started lyx for the first time?
+       bool first_start;
+       /// the parsed command line batch command if any
+       std::string batch_command;
 };
 
 ///
@@ -228,7 +230,7 @@ LyX::LyX()
        : first_start(false)
 {
        singleton_ = this;
-       pimpl_ = new Singletons;
+       pimpl_ = new Impl;
 }
 
 
@@ -372,39 +374,6 @@ void LyX::setGuiLanguage(std::string const & language)
 }
 
 
-Buffer const * LyX::updateInset(Inset const * inset) const
-{
-       if (quitting || !inset)
-               return 0;
-
-       Buffer const * buffer_ptr = 0;
-       vector<int> const & view_ids = pimpl_->application_->gui().viewIds();
-       vector<int>::const_iterator it = view_ids.begin();
-       vector<int>::const_iterator const end = view_ids.end();
-       for (; it != end; ++it) {
-               Buffer const * ptr =
-                       pimpl_->application_->gui().view(*it).updateInset(inset);
-               if (ptr)
-                       buffer_ptr = ptr;
-       }
-       return buffer_ptr;
-}
-
-
-void LyX::hideDialogs(std::string const & name, Inset * inset) const
-{
-       if (quitting || !use_gui)
-               return;
-
-       vector<int> const & view_ids = pimpl_->application_->gui().viewIds();
-       vector<int>::const_iterator it = view_ids.begin();
-       vector<int>::const_iterator const end = view_ids.end();
-       for (; it != end; ++it)
-               pimpl_->application_->gui().view(*it).getDialogs().
-                       hide(name, inset);
-}
-
-
 int LyX::exec(int & argc, char * argv[])
 {
        // Here we need to parse the command line. At least
@@ -438,7 +407,7 @@ int LyX::exec(int & argc, char * argv[])
 
                loadFiles();
 
-               if (batch_command.empty() || pimpl_->buffer_list_.empty()) {
+               if (pimpl_->batch_command.empty() || pimpl_->buffer_list_.empty()) {
                        prepareExit();
                        return EXIT_SUCCESS;
                }
@@ -451,7 +420,7 @@ int LyX::exec(int & argc, char * argv[])
                        if (buf != buf->masterBuffer())
                                continue;
                        bool success = false;
-                       buf->dispatch(batch_command, &success);
+                       buf->dispatch(pimpl_->batch_command, &success);
                        final_success |= success;
                }
                prepareExit();
@@ -461,8 +430,6 @@ int LyX::exec(int & argc, char * argv[])
        // Let the frontend parse and remove all arguments that it knows
        pimpl_->application_.reset(createApplication(argc, argv));
 
-       initGuiFont();
-
        // Parse and remove all known arguments in the LyX singleton
        // Give an error for all remaining ones.
        int exit_status = init(argc, argv);
@@ -511,8 +478,8 @@ void LyX::prepareExit()
 
        // do any other cleanup procedures now
        if (package().temp_dir() != package().system_temp_dir()) {
-               LYXERR(Debug::INFO) << "Deleting tmp dir "
-                                   << package().temp_dir().absFilename() << endl;
+               LYXERR(Debug::INFO, "Deleting tmp dir "
+                                   << package().temp_dir().absFilename());
 
                if (!package().temp_dir().destroyDirectory()) {
                        docstring const msg =
@@ -561,9 +528,9 @@ int LyX::init(int & argc, char * argv[])
        }
 
        // Initialization of LyX (reads lyxrc and more)
-       LYXERR(Debug::INIT) << "Initializing LyX::init..." << endl;
+       LYXERR(Debug::INIT, "Initializing LyX::init...");
        bool success = init();
-       LYXERR(Debug::INIT) << "Initializing LyX::init...done" << endl;
+       LYXERR(Debug::INIT, "Initializing LyX::init...done");
        if (!success)
                return EXIT_FAILURE;
 
@@ -649,13 +616,12 @@ void LyX::execBatchCommands()
        }
        
        // Execute batch commands if available
-       if (batch_command.empty())
+       if (pimpl_->batch_command.empty())
                return;
 
-       LYXERR(Debug::INIT) << "About to handle -x '"
-               << batch_command << '\'' << endl;
+       LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\'');
 
-       pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command));
+       pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
 }
 
 
@@ -672,7 +638,7 @@ void LyX::restoreGuiSession()
        if (!pimpl_->files_to_load_.empty()) {
                for_each(pimpl_->files_to_load_.begin(),
                        pimpl_->files_to_load_.end(),
-                       bind(&LyXView::loadLyXFile, view, _1, true));
+                       bind(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, true));
                // clear this list to save a few bytes of RAM
                pimpl_->files_to_load_.clear();
                pimpl_->session_->lastOpened().clear();
@@ -683,7 +649,7 @@ void LyX::restoreGuiSession()
                // last session, and should be already there (regular files), or should
                // not be added at all (help files).
                for_each(lastopened.begin(), lastopened.end(),
-                       bind(&LyXView::loadLyXFile, view, _1, false));
+                       bind(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, false));
 
                // clear this list to save a few bytes of RAM
                pimpl_->session_->lastOpened().clear();
@@ -711,58 +677,8 @@ LyXView * LyX::newLyXView()
        if (!lyx::use_gui)
                return 0;
 
-       // FIXME: transfer all this geometry stuff to the frontend.
-
-       // determine windows size and position, from lyxrc and/or session
-       // initial geometry
-       unsigned int width = 690;
-       unsigned int height = 510;
-       // default icon size, will be overwritten by  stored session value
-       unsigned int iconSizeXY = 0;
-       // FIXME: 0 means GuiView::NotMaximized by default!
-       int maximized = 0;
-       // first try lyxrc
-       if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
-               width = lyxrc.geometry_width;
-               height = lyxrc.geometry_height;
-       }
-       // if lyxrc returns (0,0), then use session info
-       else {
-               string val = session().sessionInfo().load("WindowWidth");
-               if (!val.empty())
-                       width = convert<unsigned int>(val);
-               val = session().sessionInfo().load("WindowHeight");
-               if (!val.empty())
-                       height = convert<unsigned int>(val);
-               val = session().sessionInfo().load("WindowMaximized");
-               if (!val.empty())
-                       maximized = convert<int>(val);
-               val = session().sessionInfo().load("IconSizeXY");
-               if (!val.empty())
-                       iconSizeXY = convert<unsigned int>(val);
-       }
-
-       // if user wants to restore window position
-       int posx = -1;
-       int posy = -1;
-       if (lyxrc.geometry_xysaved) {
-               string val = session().sessionInfo().load("WindowPosX");
-               if (!val.empty())
-                       posx = convert<int>(val);
-               val = session().sessionInfo().load("WindowPosY");
-               if (!val.empty())
-                       posy = convert<int>(val);
-       }
-
-       if (!geometryArg.empty())
-       {
-               width = 0;
-               height = 0;
-       }
-
        // create the main window
-       LyXView * view = &pimpl_->application_->createView(width, height,
-               posx, posy, maximized, iconSizeXY, geometryArg);
+       LyXView * view = &pimpl_->application_->createView(geometryArg);
 
        return view;
 }
@@ -874,20 +790,6 @@ void LyX::printError(ErrorItem const & ei)
 }
 
 
-void LyX::initGuiFont()
-{
-       if (lyxrc.roman_font_name.empty())
-               lyxrc.roman_font_name = pimpl_->application_->romanFontName();
-
-       if (lyxrc.sans_font_name.empty())
-               lyxrc.sans_font_name = pimpl_->application_->sansFontName();
-
-       if (lyxrc.typewriter_font_name.empty())
-               lyxrc.typewriter_font_name
-                       = pimpl_->application_->typewriterFontName();
-}
-
-
 bool LyX::init()
 {
 #ifdef SIGHUP
@@ -963,7 +865,7 @@ bool LyX::init()
                return false;
 
        // Load the layouts
-       LYXERR(Debug::INIT) << "Reading layouts..." << endl;
+       LYXERR(Debug::INIT, "Reading layouts...");
        if (!LyXSetStyle())
                return false;
        //...and the modules
@@ -1019,11 +921,10 @@ bool LyX::init()
                return false;
        }
 
-       LYXERR(Debug::INIT) << "LyX tmp dir: `"
-                           << package().temp_dir().absFilename()
-                           << '\'' << endl;
+       LYXERR(Debug::INIT, "LyX tmp dir: `"
+                           << package().temp_dir().absFilename() << '\'');
 
-       LYXERR(Debug::INIT) << "Reading session information '.lyx/session'..." << endl;
+       LYXERR(Debug::INIT, "Reading session information '.lyx/session'...");
        pimpl_->session_.reset(new Session(lyxrc.num_lastfiles));
 
        // This must happen after package initialization and after lyxrc is
@@ -1145,21 +1046,19 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
 
 bool LyX::readRcFile(string const & name)
 {
-       LYXERR(Debug::INIT) << "About to read " << name << "... ";
+       LYXERR(Debug::INIT, "About to read " << name << "... ");
 
        FileName const lyxrc_path = libFileSearch(string(), name);
        if (!lyxrc_path.empty()) {
-
-               LYXERR(Debug::INIT) << "Found in " << lyxrc_path << endl;
-
+               LYXERR(Debug::INIT, "Found in " << lyxrc_path);
                if (lyxrc.read(lyxrc_path) < 0) {
                        showFileError(name);
                        return false;
                }
-       } else
-               LYXERR(Debug::INIT) << "Not found." << lyxrc_path << endl;
+       } else {
+               LYXERR(Debug::INIT, "Not found." << lyxrc_path);
+       }
        return true;
-
 }
 
 
@@ -1187,14 +1086,12 @@ bool LyX::readUIFile(string const & name, bool include)
        std::list<string>::const_iterator end = uifiles.end();
        it = std::find(it, end, name);
        if (it != end) {
-               LYXERR(Debug::INIT) << "UI file '" << name
-                                   << "' has been read already. "
-                                   << "Is this an include loop?"
-                                   << endl;
+               LYXERR(Debug::INIT, "UI file '" << name << "' has been read already. "
+                                   << "Is this an include loop?");
                return false;
        }
 
-       LYXERR(Debug::INIT) << "About to read " << name << "..." << endl;
+       LYXERR(Debug::INIT, "About to read " << name << "...");
 
 
        FileName ui_path;
@@ -1208,15 +1105,14 @@ bool LyX::readUIFile(string const & name, bool include)
                ui_path = libFileSearch("ui", name, "ui");
 
        if (ui_path.empty()) {
-               LYXERR(Debug::INIT) << "Could not find " << name << endl;
+               LYXERR(Debug::INIT, "Could not find " << name);
                showFileError(name);
                return false;
        }
 
        uifiles.push_back(name);
 
-       LYXERR(Debug::INIT) << "Found " << name
-                           << " in " << ui_path << endl;
+       LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
        Lexer lex(uitags, ui_last - 1);
        lex.setFile(ui_path);
        if (!lex.isOK()) {
@@ -1262,7 +1158,7 @@ bool LyX::readUIFile(string const & name, bool include)
 // Read the languages file `name'
 bool LyX::readLanguagesFile(string const & name)
 {
-       LYXERR(Debug::INIT) << "About to read " << name << "..." << endl;
+       LYXERR(Debug::INIT, "About to read " << name << "...");
 
        FileName const lang_path = libFileSearch(string(), name);
        if (lang_path.empty()) {
@@ -1278,8 +1174,8 @@ bool LyX::readLanguagesFile(string const & name)
 bool LyX::readEncodingsFile(string const & enc_name,
                            string const & symbols_name)
 {
-       LYXERR(Debug::INIT) << "About to read " << enc_name << " and "
-                           << symbols_name << "..." << endl;
+       LYXERR(Debug::INIT, "About to read " << enc_name << " and "
+                           << symbols_name << "...");
 
        FileName const symbols_path = libFileSearch(string(), symbols_name);
        if (symbols_path.empty()) {
@@ -1335,6 +1231,8 @@ int parse_help(string const &, string const &)
                  "                  where command is a lyx command.\n"
                  "\t-e [--export] fmt\n"
                  "                  where fmt is the export format of choice.\n"
+                 "                  Look on Tools->Preferences->File formats->Format\n"
+                 "                  to get an idea which parameters should be passed.\n"
                  "\t-i [--import] fmt file.xxx\n"
                  "                  where fmt is the import format of choice\n"
                  "                  and file.xxx is the file to be imported.\n"
@@ -1483,7 +1381,7 @@ void LyX::easyParse(int & argc, char * argv[])
                }
        }
 
-       batch_command = batch;
+       pimpl_->batch_command = batch;
 }