#include "LyX.h"
-#include "buffer_funcs.h"
#include "Buffer.h"
#include "BufferList.h"
#include "CmdDef.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
#include <iostream>
#include <csignal>
#include <map>
+#include <stdlib.h>
#include <string>
#include <vector>
using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::addName;
-using support::addPath;
-using support::bformat;
-using support::changeExtension;
-using support::createLyXTmpDir;
-using support::FileName;
-using support::fileSearch;
-using support::getEnv;
-using support::i18nLibFileSearch;
-using support::libFileSearch;
-using support::package;
-using support::prependEnvPath;
-using support::rtrim;
-using support::Systemcall;
-
namespace Alert = frontend::Alert;
namespace os = support::os;
string cl_system_support;
string cl_user_support;
-std::string geometryArg;
+string geometryArg;
LyX * singleton_ = 0;
string const configure_command = package().configure_command();
lyxerr << to_utf8(_("LyX: reconfiguring user directory")) << endl;
- support::PathChanger p(package().user_support());
+ PathChanger p(package().user_support());
Systemcall one;
one.startscript(Systemcall::Wait, configure_command);
lyxerr << "LyX: " << to_utf8(_("Done!")) << endl;
boost::scoped_ptr<Session> session_;
/// Files to load at start.
- vector<FileName> files_to_load_;
+ vector<string> files_to_load_;
/// The messages translators.
map<string, Messages> messages_;
/// has this user started lyx for the first time?
bool first_start;
/// the parsed command line batch command if any
- std::string batch_command;
+ string batch_command;
};
///
}
+void LyX::exit(int exit_code) const
+{
+ if (exit_code)
+ // Something wrong happened so better save everything, just in
+ // case.
+ emergencyCleanup();
+
+#ifndef NDEBUG
+ // Properly crash in debug mode in order to get a useful backtrace.
+ abort();
+#endif
+
+ // In release mode, try to exit gracefully.
+ if (theApp())
+ theApp()->exit(exit_code);
+ else
+ exit(exit_code);
+}
+
+
LyX & LyX::ref()
{
BOOST_ASSERT(singleton_);
}
-Messages & LyX::getMessages(std::string const & language)
+Messages & LyX::getMessages(string const & language)
{
map<string, Messages>::iterator it = pimpl_->messages_.find(language);
if (it != pimpl_->messages_.end())
return it->second;
- std::pair<map<string, Messages>::iterator, bool> result =
- pimpl_->messages_.insert(std::make_pair(language, Messages(language)));
+ pair<map<string, Messages>::iterator, bool> result =
+ pimpl_->messages_.insert(make_pair(language, Messages(language)));
BOOST_ASSERT(result.second);
return result.first->second;
}
-void LyX::setGuiLanguage(std::string const & language)
+void LyX::setGuiLanguage(string const & language)
{
pimpl_->messages_["GUI"] = Messages(language);
}
easyParse(argc, argv);
try {
- support::init_package(to_utf8(from_local8bit(argv[0])),
+ init_package(to_utf8(from_local8bit(argv[0])),
cl_system_support, cl_user_support,
- support::top_build_dir_is_one_level_up);
- } catch (support::ExceptionMessage const & message) {
- if (message.type_ == support::ErrorException) {
+ top_build_dir_is_one_level_up);
+ } catch (ExceptionMessage const & message) {
+ if (message.type_ == ErrorException) {
Alert::error(message.title_, message.details_);
exit(1);
- } else if (message.type_ == support::WarningException) {
+ } else if (message.type_ == WarningException) {
Alert::warning(message.title_, message.details_);
}
}
if (!success)
return EXIT_FAILURE;
- for (int argi = argc - 1; argi >= 1; --argi) {
- // get absolute path of file and add ".lyx" to
- // the filename if necessary
- pimpl_->files_to_load_.push_back(fileSearch(string(),
- os::internal_path(to_utf8(from_local8bit(argv[argi]))),
- "lyx", support::allow_unreadable));
- }
+ // Remaining arguments are assumed to be files to load.
+ for (int argi = argc - 1; argi >= 1; --argi)
+ pimpl_->files_to_load_.push_back(to_utf8(from_local8bit(argv[argi])));
- if (first_start)
- pimpl_->files_to_load_.push_back(i18nLibFileSearch("examples", "splash.lyx"));
+ if (first_start) {
+ pimpl_->files_to_load_.push_back(
+ i18nLibFileSearch("examples", "splash.lyx").absFilename());
+ }
return EXIT_SUCCESS;
}
-void LyX::addFileToLoad(FileName const & fname)
+void LyX::addFileToLoad(string const & fname)
{
- vector<FileName>::const_iterator cit = std::find(
+ vector<string>::const_iterator cit = find(
pimpl_->files_to_load_.begin(), pimpl_->files_to_load_.end(),
fname);
void LyX::loadFiles()
{
- vector<FileName>::const_iterator it = pimpl_->files_to_load_.begin();
- vector<FileName>::const_iterator end = pimpl_->files_to_load_.end();
+ vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
+ vector<string>::const_iterator end = pimpl_->files_to_load_.end();
for (; it != end; ++it) {
- if (it->empty())
+ // get absolute path of file and add ".lyx" to
+ // the filename if necessary
+ FileName fname = fileSearch(string(), os::internal_path(*it), "lyx",
+ may_not_exist);
+
+ if (fname.empty())
continue;
- Buffer * buf = pimpl_->buffer_list_.newBuffer(it->absFilename(), false);
- if (buf->loadLyXFile(*it)) {
+ Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFilename(), false);
+ if (buf->loadLyXFile(fname)) {
ErrorList const & el = buf->errorList("Parse");
if (!el.empty())
for_each(el.begin(), el.end(),
// The advantage of doing this here is that the event loop
// is already started. So any need for interaction will be
// aknowledged.
- restoreGuiSession();
// if reconfiguration is needed.
- if (textclasslist.empty()) {
+ while (textclasslist.empty()) {
switch (Alert::prompt(
_("No textclass is found"),
_("LyX cannot continue because no textclass is found. "
pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE,
" --without-latex-config"));
break;
+ default:
+ pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT));
+ return;
}
- pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT));
- return;
}
- // Execute batch commands if available
- if (pimpl_->batch_command.empty())
- return;
-
- LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\'');
-
- pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
-}
-
-
-void LyX::restoreGuiSession()
-{
- // create the main window
+ // create the first 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())
- return;
-
- // if some files were specified at command-line we assume that the
- // user wants to edit *these* files and not to restore the session.
if (!pimpl_->files_to_load_.empty()) {
- for_each(pimpl_->files_to_load_.begin(),
- pimpl_->files_to_load_.end(),
- bind(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, true));
+ // if some files were specified at command-line we assume that the
+ // user wants to edit *these* files and not to restore the session.
+ for (size_t i = 0; i != pimpl_->files_to_load_.size(); ++i) {
+ pimpl_->lyxfunc_.dispatch(
+ FuncRequest(LFUN_FILE_OPEN, pimpl_->files_to_load_[i]));
+ }
// clear this list to save a few bytes of RAM
pimpl_->files_to_load_.clear();
- pimpl_->session_->lastOpened().clear();
+ }
+ else
+ pimpl_->application_->restoreGuiSession();
- } else if (lyxrc.load_session) {
- vector<FileName> const & lastopened = pimpl_->session_->lastOpened().getfiles();
- // do not add to the lastfile list since these files are restored from
- // 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(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, false));
+ // Execute batch commands if available
+ if (pimpl_->batch_command.empty())
+ return;
- // clear this list to save a few bytes of RAM
- pimpl_->session_->lastOpened().clear();
- }
+ LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\'');
- BufferList::iterator I = pimpl_->buffer_list_.begin();
- BufferList::iterator end = pimpl_->buffer_list_.end();
- for (; I != end; ++I) {
- Buffer * buf = *I;
- if (buf != buf->masterBuffer())
- continue;
- updateLabels(*buf);
- }
+ pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
}
+
/*
Signals and Windows
===================
#else
if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty())
#endif
- support::abort();
+ abort();
exit(0);
}
{
docstring tmp = _("LyX: ") + ei.error + char_type(':')
+ ei.description;
- std::cerr << to_utf8(tmp) << std::endl;
+ cerr << to_utf8(tmp) << endl;
}
pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
// Read menus
- if (!readUIFile(lyxrc.ui_file))
+ if (use_gui && !readUIFile(lyxrc.ui_file))
return false;
if (lyxerr.debugging(Debug::LYXRC))
};
// Ensure that a file is read only once (prevents include loops)
- static std::list<string> uifiles;
- std::list<string>::const_iterator it = uifiles.begin();
- std::list<string>::const_iterator end = uifiles.end();
- it = std::find(it, end, name);
+ static list<string> uifiles;
+ list<string>::const_iterator it = uifiles.begin();
+ list<string>::const_iterator end = uifiles.end();
+ it = find(it, end, name);
if (it != end) {
LYXERR(Debug::INIT, "UI file '" << name << "' has been read already. "
<< "Is this an include loop?");
break;
}
case ui_menuset:
- menubackend.read(lex);
+ theApp()->menuBackend().read(lex);
break;
case ui_toolbarset:
void LyX::easyParse(int & argc, char * argv[])
{
- std::map<string, cmd_helper> cmdmap;
+ map<string, cmd_helper> cmdmap;
cmdmap["-dbg"] = parse_dbg;
cmdmap["-help"] = parse_help;
cmdmap["-geometry"] = parse_geometry;
for (int i = 1; i < argc; ++i) {
- std::map<string, cmd_helper>::const_iterator it
+ map<string, cmd_helper>::const_iterator it
= cmdmap.find(argv[i]);
// don't complain if not found - may be parsed later
}
-Mover const & getMover(std::string const & fmt)
+Mover const & getMover(string const & fmt)
{
return LyX::ref().pimpl_->movers_(fmt);
}
-void setMover(std::string const & fmt, std::string const & command)
+void setMover(string const & fmt, string const & command)
{
LyX::ref().pimpl_->movers_.set(fmt, command);
}
}
-Messages & getMessages(std::string const & language)
+Messages & getMessages(string const & language)
{
return LyX::ref().getMessages(language);
}
projects / lyx.git / blobdiff