// guarantees a return to the system, no application cleanup.
// This may cause troubles with not executed destructors.
if (lyx_gui::use_gui)
+ // lyx_gui::exit may return and only schedule the exit
lyx_gui::exit(status);
exit(status);
}
Alert::warning(_("Could not read configuration file"),
bformat(_("Error while reading the configuration file\n%1$s.\n"
"Please check your installation."), error));
- lyx_exit(EXIT_FAILURE);
}
boost::scoped_ptr<LyX> LyX::singleton_;
-void LyX::exec(int & argc, char * argv[])
+int LyX::exec(int & argc, char * argv[])
{
BOOST_ASSERT(!singleton_.get());
// We must return from this before launching the gui so that
// LyX::ref and LyX::cref.
singleton_.reset(new LyX);
// Start the real execution loop.
- singleton_->priv_exec(argc, argv);
+ return singleton_->priv_exec(argc, argv);
}
LyX::LyX()
- : first_start(false)
+ : first_start(false), geometryOption_(false)
{}
}
-void LyX::addLyXView(boost::shared_ptr<LyXView> const & lyxview)
+void LyX::addLyXView(LyXView * lyxview)
{
views_.push_back(lyxview);
}
}
-void LyX::priv_exec(int & argc, char * argv[])
+int LyX::priv_exec(int & argc, char * argv[])
{
// Here we need to parse the command line. At least
// we need to parse for "-dbg" and "-help"
// Start the real execution loop.
if (lyx_gui::use_gui)
- lyx_gui::exec(argc, argv);
+ return lyx_gui::exec(argc, argv);
else
- exec2(argc, argv);
+ return exec2(argc, argv);
}
-void LyX::exec2(int & argc, char * argv[])
+int LyX::exec2(int & argc, char * argv[])
{
// check for any spurious extra arguments
// other than documents
if (argv[argi][0] == '-') {
lyxerr << bformat(_("Wrong command line option `%1$s'. Exiting."),
argv[argi]) << endl;
- exit(1);
+ return EXIT_FAILURE;
}
}
// Initialization of LyX (reads lyxrc and more)
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
- init();
+ bool const success = init();
lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
+ if (!success)
+ return EXIT_FAILURE;
if (lyx_gui::use_gui)
lyx_gui::parse_lyxrc();
if (first_start)
files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
- // if a file is specified, I assume that user wants to edit *that* file
- if (files.empty() && lyxrc.load_session) {
- vector<string> const & lastopened = session_->lastOpenedFiles();
- files.insert(files.end(), lastopened.begin(), lastopened.end() );
- }
- // clear this list to save a few bytes of RAM
- session_->clearLastOpenedFiles();
-
// Execute batch commands if available
if (!batch_command.empty()) {
// the filename if necessary
string s = fileSearch(string(), *it, "lyx");
if (s.empty()) {
- last_loaded = newFile(*it, string(), true);
+ Buffer * const b = newFile(*it, string(), true);
+ if (b)
+ last_loaded = b;
} else {
Buffer * buf = bufferlist.newBuffer(s, false);
- buf->error.connect(boost::bind(&LyX::printError, this, _1));
- if (loadLyXFile(buf, s))
+ if (loadLyXFile(buf, s)) {
last_loaded = buf;
+ ErrorList const & el = buf->errorList("Parse");
+ if (!el.empty())
+ for_each(el.begin(), el.end(),
+ boost::bind(&LyX::printError, this, _1));
+ }
else
bufferlist.release(buf);
}
bool success = false;
if (last_loaded->dispatch(batch_command, &success)) {
quitLyX(false);
- lyx_exit(!success);
+ return !success;
}
}
files.clear(); // the files are already loaded
if (!val.empty())
posy = convert<int>(val);
}
- lyx_gui::start(batch_command, files, width, height, posx, posy, maximize);
+
+ if (geometryOption_) {
+ width = 0;
+ height = 0;
+ }
+ // create the main window
+ LyXView * view = lyx_gui::create_view(width, height, posx, posy, maximize);
+
+ // load files
+ for_each(files.begin(), files.end(),
+ bind(&LyXView::loadLyXFile, view, _1, true));
+
+ // if a file is specified, I assume that user wants to edit *that* file
+ if (files.empty() && lyxrc.load_session) {
+ vector<string> const & lastopened = session_->lastOpenedFiles();
+ // do not add to the lastfile list since these files are restored from
+ // last seesion, 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));
+ }
+ // clear this list to save a few bytes of RAM
+ session_->clearLastOpenedFiles();
+
+ return lyx_gui::start(view, batch_command);
} else {
// Something went wrong above
quitLyX(false);
- lyx_exit(EXIT_FAILURE);
+ return EXIT_FAILURE;
}
}
}
-void LyX::init()
+bool LyX::init()
{
#ifdef SIGHUP
signal(SIGHUP, error_handler);
//
// This one may have been distributed along with LyX.
- readRcFile("lyxrc.dist");
+ if (!readRcFile("lyxrc.dist"))
+ return false;
// Set the PATH correctly.
#if !defined (USE_POSIX_PACKAGING)
if (!lyxrc.path_prefix.empty())
prependEnvPath("PATH", lyxrc.path_prefix);
- // Check that user LyX directory is ok. We don't do that if
- // running in batch mode.
- if (lyx_gui::use_gui) {
- if (queryUserLyXDir(package().explicit_user_support()))
- reconfigureUserLyXDir();
- } else {
+ // Check that user LyX directory is ok.
+ if (queryUserLyXDir(package().explicit_user_support()))
+ reconfigureUserLyXDir();
+
+ // no need for a splash when there is no GUI
+ if (!lyx_gui::use_gui) {
first_start = false;
}
// This one is generated in user_support directory by lib/configure.py.
- readRcFile("lyxrc.defaults");
+ if (!readRcFile("lyxrc.defaults"))
+ return false;
// Query the OS to know what formats are viewed natively
formats.setAutoOpen();
system_lcolor = lcolor;
// This one is edited through the preferences dialog.
- readRcFile("preferences");
+ if (!readRcFile("preferences"))
+ return false;
- readEncodingsFile("encodings");
- readLanguagesFile("languages");
+ if (!readEncodingsFile("encodings"))
+ return false;
+ if (!readLanguagesFile("languages"))
+ return false;
// Load the layouts
lyxerr[Debug::INIT] << "Reading layouts..." << endl;
- LyXSetStyle();
+ if (!LyXSetStyle())
+ return false;
if (lyx_gui::use_gui) {
// Set up bindings
toplevel_keymap->read(lyxrc.bind_file);
// Read menus
- readUIFile(lyxrc.ui_file);
+ if (!readUIFile(lyxrc.ui_file))
+ return false;
}
if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
- os::cygwin_path_fix(lyxrc.cygwin_path_fix);
+ os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);
if (!lyxrc.path_prefix.empty())
prependEnvPath("PATH", lyxrc.path_prefix);
// close to zero. We therefore don't try to overcome this
// problem with e.g. asking the user for a new path and
// trying again but simply exit.
- lyx_exit(EXIT_FAILURE);
+ return false;
}
if (lyxerr.debugging(Debug::INIT)) {
lyxerr[Debug::INIT] << "Reading session information '.lyx/session'..." << endl;
session_.reset(new lyx::Session(lyxrc.num_lastfiles));
+ return true;
}
}
-void LyX::readRcFile(string const & name)
+bool LyX::readRcFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "... ";
lyxerr[Debug::INIT] << "Found in " << lyxrc_path << endl;
- if (lyxrc.read(lyxrc_path) < 0)
+ if (lyxrc.read(lyxrc_path) < 0) {
showFileError(name);
+ return false;
+ }
} else
lyxerr[Debug::INIT] << "Not found." << lyxrc_path << endl;
+ return true;
}
// Read the ui file `name'
-void LyX::readUIFile(string const & name)
+bool LyX::readUIFile(string const & name)
{
enum Uitags {
ui_menuset = 1,
<< "' has been read already. "
<< "Is this an include loop?"
<< endl;
- return;
+ return false;
}
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
if (ui_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
showFileError(name);
- return;
+ return false;
}
uifiles.push_back(name);
case ui_include: {
lex.next(true);
string const file = lex.getString();
- readUIFile(file);
+ if (!readUIFile(file))
+ return false;
break;
}
case ui_menuset:
break;
}
}
+ return true;
}
// Read the languages file `name'
-void LyX::readLanguagesFile(string const & name)
+bool LyX::readLanguagesFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
string const lang_path = libFileSearch(string(), name);
if (lang_path.empty()) {
showFileError(name);
- return;
+ return false;
}
languages.read(lang_path);
+ return true;
}
// Read the encodings file `name'
-void LyX::readEncodingsFile(string const & name)
+bool LyX::readEncodingsFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
string const enc_path = libFileSearch(string(), name);
if (enc_path.empty()) {
showFileError(name);
- return;
+ return false;
}
encodings.read(enc_path);
+ return true;
}
int parse_version(string const &, string const &)
{
lyxerr << "LyX " << lyx_version
- << " of " << lyx_release_date << endl;
+ << " (" << lyx_release_date << ")" << endl;
lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
lyxerr << lyx_version_info << endl;
std::map<string, cmd_helper>::const_iterator it
= cmdmap.find(argv[i]);
+ // check for X11 -geometry option
+ if (lyx::support::compare(argv[i], "-geometry") == 0)
+ geometryOption_ = true;
+
// don't complain if not found - may be parsed later
if (it == cmdmap.end())
continue;