X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=db9e92033a41066a4a7b805bf39b8f37636d3239;hb=8c6ac457ecc69f57ab54cd8c9b8b7893607c65d6;hp=829202e54c656e8d3a7d0e12125f0dd529d3026b;hpb=7fb4a57ab9c049a7b7b197b1b8e86d497714988a;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index 829202e54c..db9e92033a 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -17,52 +17,50 @@ #include "LyX.h" -#include "Color.h" -#include "ConverterCache.h" -#include "Buffer.h" #include "buffer_funcs.h" +#include "Buffer.h" #include "BufferList.h" +#include "CmdDef.h" +#include "Color.h" +#include "ConverterCache.h" #include "Converter.h" #include "CutAndPaste.h" -#include "debug.h" #include "Encoding.h" #include "ErrorList.h" #include "Format.h" -#include "gettext.h" #include "KeyMap.h" -#include "CmdDef.h" #include "Language.h" -#include "Session.h" +#include "Lexer.h" #include "LyXAction.h" #include "LyXFunc.h" -#include "Lexer.h" #include "LyXRC.h" +#include "MenuBackend.h" #include "ModuleList.h" +#include "Mover.h" #include "Server.h" #include "ServerSocket.h" +#include "Session.h" #include "TextClassList.h" -#include "MenuBackend.h" -#include "Messages.h" -#include "Mover.h" #include "ToolbarBackend.h" #include "frontends/alert.h" #include "frontends/Application.h" -#include "frontends/Dialogs.h" -#include "frontends/Gui.h" -#include "frontends/LyXView.h" +#include "support/debug.h" #include "support/environment.h" +#include "support/ExceptionMessage.h" #include "support/filetools.h" +#include "support/gettext.h" +#include "support/lstrings.h" #include "support/lyxlib.h" -#include "support/convert.h" -#include "support/ExceptionMessage.h" +#include "support/Messages.h" #include "support/os.h" #include "support/Package.h" #include "support/Path.h" #include "support/Systemcall.h" #include +#include #include #include @@ -100,17 +98,15 @@ using support::package; using support::prependEnvPath; using support::rtrim; using support::Systemcall; -using frontend::LyXView; namespace Alert = frontend::Alert; namespace os = support::os; -/// are we using the GUI at all? -/** -* We default to true and this is changed to false when the export feature is used. -*/ +// Are we using the GUI at all? We default to true and this is changed +// to false when the export feature is used. + bool use_gui = true; bool quitting; // flag, that we are quitting the program @@ -139,7 +135,7 @@ void reconfigureUserLyXDir() string const configure_command = package().configure_command(); lyxerr << to_utf8(_("LyX: reconfiguring user directory")) << endl; - support::Path p(package().user_support()); + support::PathChanger p(package().user_support()); Systemcall one; one.startscript(Systemcall::Wait, configure_command); lyxerr << "LyX: " << to_utf8(_("Done!")) << endl; @@ -149,9 +145,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 @@ -163,9 +159,9 @@ struct LyX::Singletons /// BufferList buffer_list_; /// - boost::scoped_ptr toplevel_keymap_; + KeyMap toplevel_keymap_; /// - boost::scoped_ptr toplevel_cmddef_; + CmdDef toplevel_cmddef_; /// boost::scoped_ptr lyx_server_; /// @@ -189,9 +185,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; }; /// @@ -206,6 +206,7 @@ frontend::Application * theApp() LyX::~LyX() { + delete pimpl_; } @@ -227,7 +228,7 @@ LyX::LyX() : first_start(false) { singleton_ = this; - pimpl_.reset(new Singletons); + pimpl_ = new Impl; } @@ -313,15 +314,13 @@ frontend::Application const & LyX::application() const KeyMap & LyX::topLevelKeymap() { - BOOST_ASSERT(pimpl_->toplevel_keymap_.get()); - return *pimpl_->toplevel_keymap_.get(); + return pimpl_->toplevel_keymap_; } CmdDef & LyX::topLevelCmdDef() { - BOOST_ASSERT(pimpl_->toplevel_cmddef_.get()); - return *pimpl_->toplevel_cmddef_.get(); + return pimpl_->toplevel_cmddef_; } @@ -339,8 +338,7 @@ Converters & LyX::systemConverters() KeyMap const & LyX::topLevelKeymap() const { - BOOST_ASSERT(pimpl_->toplevel_keymap_.get()); - return *pimpl_->toplevel_keymap_.get(); + return pimpl_->toplevel_keymap_; } @@ -371,39 +369,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 const & view_ids = pimpl_->application_->gui().viewIds(); - vector::const_iterator it = view_ids.begin(); - vector::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 const & view_ids = pimpl_->application_->gui().viewIds(); - vector::const_iterator it = view_ids.begin(); - vector::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 @@ -437,7 +402,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; } @@ -450,7 +415,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(); @@ -460,8 +425,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); @@ -508,10 +471,19 @@ void LyX::prepareExit() // close buffers first pimpl_->buffer_list_.closeAll(); + // register session changes and shutdown server and socket + if (use_gui) { + if (pimpl_->session_) + pimpl_->session_->writeFile(); + pimpl_->session_.reset(); + pimpl_->lyx_server_.reset(); + pimpl_->lyx_socket_.reset(); + } + // 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 = @@ -521,14 +493,6 @@ void LyX::prepareExit() } } - if (use_gui) { - if (pimpl_->session_) - pimpl_->session_->writeFile(); - pimpl_->session_.reset(); - pimpl_->lyx_server_.reset(); - pimpl_->lyx_socket_.reset(); - } - // Kill the application object before exiting. This avoids crashes // when exiting on Linux. if (pimpl_->application_) @@ -560,9 +524,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; @@ -648,19 +612,19 @@ 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)); } void LyX::restoreGuiSession() { - LyXView * view = newLyXView(); + // create the main window + pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg)); // if there is no valid class list, do not load any file. if (textclasslist.empty()) @@ -671,7 +635,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(); @@ -682,7 +646,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(); @@ -696,70 +660,6 @@ void LyX::restoreGuiSession() continue; updateLabels(*buf); } - - // FIXME: Switch to the last loaded Buffer. This must not be the first one - // because the Buffer won't be connected in this case. The correct solution - // would be to avoid the manual connection of the current Buffer in LyXView. - if (!pimpl_->buffer_list_.empty()) - view->setBuffer(pimpl_->buffer_list_.last()); -} - - -LyXView * LyX::newLyXView() -{ - if (!lyx::use_gui) - return 0; - - // 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; - int maximized = LyXView::NotMaximized; - // 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(val); - val = session().sessionInfo().load("WindowHeight"); - if (!val.empty()) - height = convert(val); - val = session().sessionInfo().load("WindowMaximized"); - if (!val.empty()) - maximized = convert(val); - val = session().sessionInfo().load("IconSizeXY"); - if (!val.empty()) - iconSizeXY = convert(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(val); - val = session().sessionInfo().load("WindowPosY"); - if (!val.empty()) - posy = convert(val); - } - - if (!geometryArg.empty()) - { - width = 0; - height = 0; - } - - // create the main window - LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximized, iconSizeXY, geometryArg); - - return view; } /* @@ -869,20 +769,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 @@ -897,6 +783,10 @@ bool LyX::init() lyxrc.tempdir_path = package().temp_dir().absFilename(); lyxrc.document_path = package().document_dir().absFilename(); + if (lyxrc.example_path.empty()) { + lyxrc.example_path = addPath(package().system_support().absFilename(), + "examples"); + } if (lyxrc.template_path.empty()) { lyxrc.template_path = addPath(package().system_support().absFilename(), "templates"); @@ -958,7 +848,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 @@ -972,17 +862,15 @@ bool LyX::init() //setGuiLanguage(lyxrc.gui_language); // Set up command definitions - pimpl_->toplevel_cmddef_.reset(new CmdDef); - pimpl_->toplevel_cmddef_->read(lyxrc.def_file); + pimpl_->toplevel_cmddef_.read(lyxrc.def_file); // Set up bindings - pimpl_->toplevel_keymap_.reset(new KeyMap); - pimpl_->toplevel_keymap_->read("site"); - pimpl_->toplevel_keymap_->read(lyxrc.bind_file); + pimpl_->toplevel_keymap_.read("site"); + pimpl_->toplevel_keymap_.read(lyxrc.bind_file); // load user bind file user.bind - pimpl_->toplevel_keymap_->read("user"); + pimpl_->toplevel_keymap_.read("user"); - pimpl_->lyxfunc_.initKeySequences(pimpl_->toplevel_keymap_.get()); + pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_); // Read menus if (!readUIFile(lyxrc.ui_file)) @@ -1014,11 +902,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 @@ -1140,21 +1027,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; - } @@ -1182,14 +1067,12 @@ bool LyX::readUIFile(string const & name, bool include) std::list::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; @@ -1203,15 +1086,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()) { @@ -1257,7 +1139,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()) { @@ -1273,8 +1155,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()) { @@ -1330,6 +1212,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" @@ -1339,6 +1223,7 @@ int parse_help(string const &, string const &) return 0; } + int parse_version(string const &, string const &) { lyxerr << "LyX " << lyx_version @@ -1350,6 +1235,7 @@ int parse_version(string const &, string const &) return 0; } + int parse_sysdir(string const & arg, string const &) { if (arg.empty()) { @@ -1361,6 +1247,7 @@ int parse_sysdir(string const & arg, string const &) return 1; } + int parse_userdir(string const & arg, string const &) { if (arg.empty()) { @@ -1372,6 +1259,7 @@ int parse_userdir(string const & arg, string const &) return 1; } + int parse_execute(string const & arg, string const &) { if (arg.empty()) { @@ -1383,6 +1271,7 @@ int parse_execute(string const & arg, string const &) return 1; } + int parse_export(string const & type, string const &) { if (type.empty()) { @@ -1395,6 +1284,7 @@ int parse_export(string const & type, string const &) return 1; } + int parse_import(string const & type, string const & file) { if (type.empty()) { @@ -1411,6 +1301,7 @@ int parse_import(string const & type, string const & file) return 2; } + int parse_geometry(string const & arg1, string const &) { geometryArg = arg1; @@ -1454,8 +1345,10 @@ void LyX::easyParse(int & argc, char * argv[]) if (it == cmdmap.end()) continue; - string const arg((i + 1 < argc) ? to_utf8(from_local8bit(argv[i + 1])) : string()); - string const arg2((i + 2 < argc) ? to_utf8(from_local8bit(argv[i + 2])) : string()); + string const arg = + (i + 1 < argc) ? to_utf8(from_local8bit(argv[i + 1])) : string(); + string const arg2 = + (i + 2 < argc) ? to_utf8(from_local8bit(argv[i + 2])) : string(); int const remove = 1 + it->second(arg, arg2); @@ -1469,7 +1362,7 @@ void LyX::easyParse(int & argc, char * argv[]) } } - batch_command = batch; + pimpl_->batch_command = batch; }