2002-06-12 03:16:41 +00:00
|
|
|
|
/**
|
|
|
|
|
* \file lyx_main.C
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
2002-03-21 17:27:08 +00:00
|
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* \author Alfredo Braunstein
|
2003-07-04 08:23:23 +00:00
|
|
|
|
* \author Lars Gullik Bj<EFBFBD>nnes
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* \author Jean-Marc Lasgouttes
|
|
|
|
|
* \author John Levon
|
|
|
|
|
* \author Andr<EFBFBD> P<EFBFBD>nitz
|
|
|
|
|
*
|
|
|
|
|
* Full author contact details are available in file CREDITS.
|
2002-06-12 03:16:41 +00:00
|
|
|
|
*/
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
#include <config.h>
|
2001-12-28 13:26:54 +00:00
|
|
|
|
#include <version.h>
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
#include "lyx_main.h"
|
2002-06-24 20:28:12 +00:00
|
|
|
|
|
2002-08-06 14:40:13 +00:00
|
|
|
|
#include "buffer.h"
|
2003-06-20 12:46:28 +00:00
|
|
|
|
#include "buffer_funcs.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "bufferlist.h"
|
|
|
|
|
#include "converter.h"
|
|
|
|
|
#include "debug.h"
|
|
|
|
|
#include "encoding.h"
|
2003-09-06 18:38:02 +00:00
|
|
|
|
#include "errorlist.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "format.h"
|
|
|
|
|
#include "gettext.h"
|
2000-02-04 09:38:32 +00:00
|
|
|
|
#include "kbmap.h"
|
2002-06-12 09:47:10 +00:00
|
|
|
|
#include "language.h"
|
2006-04-05 22:56:18 +00:00
|
|
|
|
#include "session.h"
|
2003-09-15 15:20:22 +00:00
|
|
|
|
#include "LColor.h"
|
2006-04-09 00:26:19 +00:00
|
|
|
|
#include "lyx_cb.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "lyxfunc.h"
|
|
|
|
|
#include "lyxlex.h"
|
2003-09-06 23:36:02 +00:00
|
|
|
|
#include "lyxrc.h"
|
2002-07-21 21:21:06 +00:00
|
|
|
|
#include "lyxtextclasslist.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "lyxserver.h"
|
|
|
|
|
#include "MenuBackend.h"
|
2004-10-26 18:39:13 +00:00
|
|
|
|
#include "mover.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "ToolbarBackend.h"
|
2001-12-28 13:26:54 +00:00
|
|
|
|
|
|
|
|
|
#include "frontends/Alert.h"
|
2002-06-12 09:47:10 +00:00
|
|
|
|
#include "frontends/lyx_gui.h"
|
2003-10-14 21:30:23 +00:00
|
|
|
|
#include "frontends/LyXView.h"
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2005-02-15 13:45:41 +00:00
|
|
|
|
#include "support/environment.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "support/filetools.h"
|
|
|
|
|
#include "support/lyxlib.h"
|
2006-05-29 15:11:19 +00:00
|
|
|
|
#include "support/convert.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "support/os.h"
|
2005-01-10 19:17:43 +00:00
|
|
|
|
#include "support/package.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
#include "support/path.h"
|
2006-05-09 15:41:42 +00:00
|
|
|
|
#include "support/systemcall.h"
|
2003-09-04 03:54:04 +00:00
|
|
|
|
|
2003-06-20 23:03:43 +00:00
|
|
|
|
#include <boost/bind.hpp>
|
2005-01-31 10:42:26 +00:00
|
|
|
|
#include <boost/filesystem/operations.hpp>
|
2002-08-07 23:43:38 +00:00
|
|
|
|
|
2003-06-20 23:03:43 +00:00
|
|
|
|
#include <iostream>
|
2003-09-07 21:25:37 +00:00
|
|
|
|
#include <csignal>
|
2001-12-28 13:26:54 +00:00
|
|
|
|
|
2006-04-08 22:31:11 +00:00
|
|
|
|
using lyx::support::addName;
|
|
|
|
|
using lyx::support::addPath;
|
2003-09-09 22:13:45 +00:00
|
|
|
|
using lyx::support::bformat;
|
|
|
|
|
using lyx::support::createDirectory;
|
2004-02-25 12:00:53 +00:00
|
|
|
|
using lyx::support::createLyXTmpDir;
|
2006-04-08 22:31:11 +00:00
|
|
|
|
using lyx::support::fileSearch;
|
2005-02-15 13:45:41 +00:00
|
|
|
|
using lyx::support::getEnv;
|
2003-09-09 22:13:45 +00:00
|
|
|
|
using lyx::support::i18nLibFileSearch;
|
2006-04-08 22:31:11 +00:00
|
|
|
|
using lyx::support::libFileSearch;
|
2005-01-10 19:17:43 +00:00
|
|
|
|
using lyx::support::package;
|
2005-01-16 21:01:41 +00:00
|
|
|
|
using lyx::support::prependEnvPath;
|
2003-09-09 22:13:45 +00:00
|
|
|
|
using lyx::support::rtrim;
|
2006-05-09 15:41:42 +00:00
|
|
|
|
using lyx::support::Systemcall;
|
2003-09-16 11:03:20 +00:00
|
|
|
|
|
2006-09-11 08:54:10 +00:00
|
|
|
|
using lyx::docstring;
|
|
|
|
|
|
2004-12-15 19:35:43 +00:00
|
|
|
|
namespace os = lyx::support::os;
|
2005-01-31 10:42:26 +00:00
|
|
|
|
namespace fs = boost::filesystem;
|
2004-12-15 19:35:43 +00:00
|
|
|
|
|
2000-03-28 02:18:55 +00:00
|
|
|
|
using std::endl;
|
2003-10-06 15:43:21 +00:00
|
|
|
|
using std::string;
|
2003-09-09 22:13:45 +00:00
|
|
|
|
using std::vector;
|
|
|
|
|
|
2001-05-02 10:47:07 +00:00
|
|
|
|
#ifndef CXX_GLOBAL_CSTD
|
2002-06-10 07:57:39 +00:00
|
|
|
|
using std::exit;
|
2001-05-02 10:47:07 +00:00
|
|
|
|
using std::signal;
|
2002-06-10 07:57:39 +00:00
|
|
|
|
using std::system;
|
2001-05-02 10:47:07 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2003-09-09 22:13:45 +00:00
|
|
|
|
|
2002-06-12 09:47:10 +00:00
|
|
|
|
extern LyXServer * lyxserver;
|
2002-06-24 20:28:12 +00:00
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
// This is the global bufferlist object
|
|
|
|
|
BufferList bufferlist;
|
|
|
|
|
|
|
|
|
|
// convenient to have it here.
|
2001-03-07 16:18:05 +00:00
|
|
|
|
boost::scoped_ptr<kb_keymap> toplevel_keymap;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2003-04-02 18:08:05 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
2005-01-10 19:17:43 +00:00
|
|
|
|
// Filled with the command line arguments "foo" of "-sysdir foo" or
|
|
|
|
|
// "-userdir foo".
|
|
|
|
|
string cl_system_support;
|
|
|
|
|
string cl_user_support;
|
|
|
|
|
|
|
|
|
|
|
2006-06-07 20:08:37 +00:00
|
|
|
|
void lyx_exit(int status)
|
|
|
|
|
{
|
|
|
|
|
// FIXME: We should not directly call exit(), since it only
|
|
|
|
|
// guarantees a return to the system, no application cleanup.
|
|
|
|
|
// This may cause troubles with not executed destructors.
|
|
|
|
|
if (lyx_gui::use_gui)
|
2006-07-05 17:01:26 +00:00
|
|
|
|
// lyx_gui::exit may return and only schedule the exit
|
2006-06-07 20:08:37 +00:00
|
|
|
|
lyx_gui::exit(status);
|
|
|
|
|
exit(status);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-04-02 18:08:05 +00:00
|
|
|
|
void showFileError(string const & error)
|
|
|
|
|
{
|
2006-09-11 08:54:10 +00:00
|
|
|
|
Alert::warning(_("Could not read configuration file"),
|
|
|
|
|
bformat(_("Error while reading the configuration file\n%1$s.\n"
|
|
|
|
|
"Please check your installation."), lyx::from_utf8(error)));
|
2003-04-02 18:08:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
2005-01-16 21:01:41 +00:00
|
|
|
|
|
|
|
|
|
void reconfigureUserLyXDir()
|
|
|
|
|
{
|
2006-04-22 11:58:02 +00:00
|
|
|
|
string const configure_command = package().configure_command();
|
2005-01-16 21:01:41 +00:00
|
|
|
|
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("LyX: reconfiguring user directory")) << endl;
|
2006-09-12 17:41:50 +00:00
|
|
|
|
lyx::support::Path p(package().user_support());
|
2006-05-09 15:41:42 +00:00
|
|
|
|
Systemcall one;
|
|
|
|
|
one.startscript(Systemcall::Wait, configure_command);
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << "LyX: " << lyx::to_utf8(_("Done!")) << endl;
|
2005-01-16 21:01:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-14 21:30:23 +00:00
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boost::scoped_ptr<LyX> LyX::singleton_;
|
|
|
|
|
|
2006-07-05 17:01:26 +00:00
|
|
|
|
int LyX::exec(int & argc, char * argv[])
|
2003-10-14 21:30:23 +00:00
|
|
|
|
{
|
|
|
|
|
BOOST_ASSERT(!singleton_.get());
|
|
|
|
|
// We must return from this before launching the gui so that
|
|
|
|
|
// other parts of the code can access singleton_ through
|
|
|
|
|
// LyX::ref and LyX::cref.
|
|
|
|
|
singleton_.reset(new LyX);
|
|
|
|
|
// Start the real execution loop.
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return singleton_->priv_exec(argc, argv);
|
2003-10-14 21:30:23 +00:00
|
|
|
|
}
|
2004-03-22 13:09:59 +00:00
|
|
|
|
|
2003-10-14 21:30:23 +00:00
|
|
|
|
|
|
|
|
|
LyX & LyX::ref()
|
|
|
|
|
{
|
|
|
|
|
BOOST_ASSERT(singleton_.get());
|
|
|
|
|
return *singleton_.get();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LyX const & LyX::cref()
|
|
|
|
|
{
|
|
|
|
|
BOOST_ASSERT(singleton_.get());
|
|
|
|
|
return *singleton_.get();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LyX::LyX()
|
2006-06-21 10:30:32 +00:00
|
|
|
|
: first_start(false), geometryOption_(false)
|
2003-10-14 21:30:23 +00:00
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
|
2006-04-05 22:56:18 +00:00
|
|
|
|
lyx::Session & LyX::session()
|
2003-10-14 21:30:23 +00:00
|
|
|
|
{
|
2006-04-05 22:56:18 +00:00
|
|
|
|
BOOST_ASSERT(session_.get());
|
|
|
|
|
return *session_.get();
|
2003-10-14 21:30:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-04-05 22:56:18 +00:00
|
|
|
|
lyx::Session const & LyX::session() const
|
2003-10-14 21:30:23 +00:00
|
|
|
|
{
|
2006-04-05 22:56:18 +00:00
|
|
|
|
BOOST_ASSERT(session_.get());
|
|
|
|
|
return *session_.get();
|
2003-10-14 21:30:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-06-26 16:55:35 +00:00
|
|
|
|
void LyX::addLyXView(LyXView * lyxview)
|
2003-10-14 21:30:23 +00:00
|
|
|
|
{
|
|
|
|
|
views_.push_back(lyxview);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-04-13 13:10:33 +00:00
|
|
|
|
Buffer const * const LyX::updateInset(InsetBase const * inset) const
|
2003-10-14 21:30:23 +00:00
|
|
|
|
{
|
|
|
|
|
if (!inset)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
Buffer const * buffer_ptr = 0;
|
|
|
|
|
ViewList::const_iterator it = views_.begin();
|
|
|
|
|
ViewList::const_iterator const end = views_.end();
|
|
|
|
|
for (; it != end; ++it) {
|
|
|
|
|
Buffer const * ptr = (*it)->updateInset(inset);
|
|
|
|
|
if (ptr)
|
|
|
|
|
buffer_ptr = ptr;
|
|
|
|
|
}
|
|
|
|
|
return buffer_ptr;
|
2003-04-02 18:08:05 +00:00
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2003-10-14 21:30:23 +00:00
|
|
|
|
|
2006-07-05 17:01:26 +00:00
|
|
|
|
int LyX::priv_exec(int & argc, char * argv[])
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
|
|
|
|
// Here we need to parse the command line. At least
|
|
|
|
|
// we need to parse for "-dbg" and "-help"
|
2006-06-07 20:08:37 +00:00
|
|
|
|
lyx_gui::use_gui = easyParse(argc, argv);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2005-01-31 19:57:03 +00:00
|
|
|
|
lyx::support::init_package(argv[0], cl_system_support, cl_user_support,
|
|
|
|
|
lyx::support::top_build_dir_is_one_level_up);
|
2005-01-10 19:17:43 +00:00
|
|
|
|
|
2006-06-07 20:08:37 +00:00
|
|
|
|
// Start the real execution loop.
|
|
|
|
|
if (lyx_gui::use_gui)
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return lyx_gui::exec(argc, argv);
|
2006-06-07 20:08:37 +00:00
|
|
|
|
else
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return exec2(argc, argv);
|
2006-06-07 20:08:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2006-07-05 17:01:26 +00:00
|
|
|
|
int LyX::exec2(int & argc, char * argv[])
|
2006-06-07 20:08:37 +00:00
|
|
|
|
{
|
2002-06-12 09:47:10 +00:00
|
|
|
|
// check for any spurious extra arguments
|
|
|
|
|
// other than documents
|
|
|
|
|
for (int argi = 1; argi < argc ; ++argi) {
|
2000-05-29 15:29:50 +00:00
|
|
|
|
if (argv[argi][0] == '-') {
|
2006-09-11 08:54:10 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(
|
|
|
|
|
bformat(_("Wrong command line option `%1$s'. Exiting."),
|
|
|
|
|
lyx::from_utf8(argv[argi]))) << endl;
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return EXIT_FAILURE;
|
2000-05-29 15:29:50 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
// Initialization of LyX (reads lyxrc and more)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
|
2006-07-05 17:01:26 +00:00
|
|
|
|
bool const success = init();
|
1999-11-09 23:52:04 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!success)
|
|
|
|
|
return EXIT_FAILURE;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2006-06-07 20:08:37 +00:00
|
|
|
|
if (lyx_gui::use_gui)
|
2002-06-12 09:47:10 +00:00
|
|
|
|
lyx_gui::parse_lyxrc();
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2002-06-12 09:47:10 +00:00
|
|
|
|
vector<string> files;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2003-09-09 18:27:24 +00:00
|
|
|
|
for (int argi = argc - 1; argi >= 1; --argi)
|
2005-03-29 14:47:54 +00:00
|
|
|
|
files.push_back(os::internal_path(argv[argi]));
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2003-04-02 18:08:05 +00:00
|
|
|
|
if (first_start)
|
2002-06-12 09:47:10 +00:00
|
|
|
|
files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
|
2002-06-24 20:28:12 +00:00
|
|
|
|
|
1999-12-10 00:07:59 +00:00
|
|
|
|
// Execute batch commands if available
|
2000-04-28 11:18:04 +00:00
|
|
|
|
if (!batch_command.empty()) {
|
2003-07-18 07:25:16 +00:00
|
|
|
|
|
2002-06-12 09:47:10 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "About to handle -x '"
|
2002-11-27 10:30:28 +00:00
|
|
|
|
<< batch_command << '\'' << endl;
|
2000-04-28 11:18:04 +00:00
|
|
|
|
|
2002-08-06 14:40:13 +00:00
|
|
|
|
Buffer * last_loaded = 0;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
|
2003-06-27 07:11:31 +00:00
|
|
|
|
vector<string>::const_iterator it = files.begin();
|
|
|
|
|
vector<string>::const_iterator end = files.end();
|
|
|
|
|
|
2002-08-06 14:40:13 +00:00
|
|
|
|
for (; it != end; ++it) {
|
2003-06-30 23:56:22 +00:00
|
|
|
|
// get absolute path of file and add ".lyx" to
|
2003-06-27 07:11:31 +00:00
|
|
|
|
// the filename if necessary
|
2006-04-08 22:31:11 +00:00
|
|
|
|
string s = fileSearch(string(), *it, "lyx");
|
2003-06-27 07:11:31 +00:00
|
|
|
|
if (s.empty()) {
|
2006-07-17 15:13:49 +00:00
|
|
|
|
Buffer * const b = newFile(*it, string(), true);
|
|
|
|
|
if (b)
|
|
|
|
|
last_loaded = b;
|
2003-07-18 07:25:16 +00:00
|
|
|
|
} else {
|
2003-07-29 16:40:26 +00:00
|
|
|
|
Buffer * buf = bufferlist.newBuffer(s, false);
|
2006-08-13 16:16:43 +00:00
|
|
|
|
if (loadLyXFile(buf, s)) {
|
2003-07-29 16:40:26 +00:00
|
|
|
|
last_loaded = buf;
|
2006-08-13 16:16:43 +00:00
|
|
|
|
ErrorList const & el = buf->errorList("Parse");
|
2006-08-14 09:33:49 +00:00
|
|
|
|
if (!el.empty())
|
|
|
|
|
for_each(el.begin(), el.end(),
|
|
|
|
|
boost::bind(&LyX::printError, this, _1));
|
2006-07-15 22:43:37 +00:00
|
|
|
|
}
|
2006-08-13 16:16:43 +00:00
|
|
|
|
else
|
|
|
|
|
bufferlist.release(buf);
|
2003-06-27 07:11:31 +00:00
|
|
|
|
}
|
2002-08-06 14:40:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-04-28 11:18:04 +00:00
|
|
|
|
// try to dispatch to last loaded buffer first
|
2003-07-18 07:51:21 +00:00
|
|
|
|
if (last_loaded) {
|
|
|
|
|
bool success = false;
|
|
|
|
|
if (last_loaded->dispatch(batch_command, &success)) {
|
2006-04-09 00:26:19 +00:00
|
|
|
|
quitLyX(false);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return !success;
|
2003-07-18 07:51:21 +00:00
|
|
|
|
}
|
2003-09-09 18:27:24 +00:00
|
|
|
|
}
|
2003-07-18 07:51:21 +00:00
|
|
|
|
files.clear(); // the files are already loaded
|
1999-12-10 00:07:59 +00:00
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-06-07 20:08:37 +00:00
|
|
|
|
if (lyx_gui::use_gui) {
|
2006-05-29 15:11:19 +00:00
|
|
|
|
// determine windows size and position, from lyxrc and/or session
|
|
|
|
|
// initial geometry
|
|
|
|
|
unsigned int width = 690;
|
|
|
|
|
unsigned int height = 510;
|
coding style and readability corrections
Index: frontends/qt3/lyx_gui.C
===================================================================
--- frontends/qt3/lyx_gui.C (revision 14088)
+++ frontends/qt3/lyx_gui.C (working copy)
@@ -222,12 +222,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C (revision 14088)
+++ frontends/qt3/QtView.C (working copy)
@@ -55,12 +55,12 @@
-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
- if(isMax)
+ if (maximize)
this->setWindowState(WindowMaximized);
qApp->setMainWidget(this);
@@ -164,7 +164,7 @@
void QtView::closeEvent(QCloseEvent *)
{
LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
- //don't save maximized values
+ // don't save maximized values
this->showNormal();
// save windows size and position
LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h (revision 14088)
+++ frontends/qt3/QtView.h (working copy)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h, bool isMax);
+ QtView(unsigned int w, unsigned int h, bool maximize);
~QtView();
Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C (revision 14088)
+++ frontends/qt4/lyx_gui.C (working copy)
@@ -228,12 +228,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt4/QtView.C
===================================================================
--- frontends/qt4/QtView.C (revision 14088)
+++ frontends/qt4/QtView.C (working copy)
@@ -70,12 +70,12 @@
} // namespace anon
-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
- if(isMax)
+ if (maximize)
this->setWindowState(Qt::WindowMaximized);
mainWidget_ = this;
Index: frontends/qt4/QtView.h
===================================================================
--- frontends/qt4/QtView.h (revision 14088)
+++ frontends/qt4/QtView.h (working copy)
@@ -47,7 +47,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h, bool isMax);
+ QtView(unsigned int w, unsigned int h, bool maximize);
~QtView();
Index: frontends/lyx_gui.h
===================================================================
--- frontends/lyx_gui.h (revision 14088)
+++ frontends/lyx_gui.h (working copy)
@@ -57,7 +57,7 @@
* batch commands, and loading the given documents
*/
void start(std::string const & batch, std::vector<std::string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax);
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize);
/**
* Enter the main event loop (\sa LyX::exec2)
Index: lyx_main.C
===================================================================
--- lyx_main.C (revision 14088)
+++ lyx_main.C (working copy)
@@ -307,7 +307,7 @@
// initial geometry
unsigned int width = 690;
unsigned int height = 510;
- bool isMax = false;
+ bool maximize = false;
// first try lyxrc
if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
width = lyxrc.geometry_width;
@@ -322,7 +322,7 @@
if (!val.empty())
height = convert<unsigned int>(val);
if (session().loadSessionInfo("WindowIsMaximized") == "yes")
- isMax = true;
+ maximize = true;
}
// if user wants to restore window position
int posx = -1;
@@ -335,7 +335,7 @@
if (!val.empty())
posy = convert<int>(val);
}
- lyx_gui::start(batch_command, files, width, height, posx, posy, isMax);
+ lyx_gui::start(batch_command, files, width, height, posx, posy, maximize);
} else {
// Something went wrong above
quitLyX(false);
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14089 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 08:24:43 +00:00
|
|
|
|
bool maximize = false;
|
2006-05-29 15:11:19 +00:00
|
|
|
|
// 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 {
|
2006-06-07 20:08:37 +00:00
|
|
|
|
string val = session().loadSessionInfo("WindowWidth");
|
2006-05-29 15:11:19 +00:00
|
|
|
|
if (!val.empty())
|
|
|
|
|
width = convert<unsigned int>(val);
|
2006-06-07 20:08:37 +00:00
|
|
|
|
val = session().loadSessionInfo("WindowHeight");
|
2006-05-29 15:11:19 +00:00
|
|
|
|
if (!val.empty())
|
|
|
|
|
height = convert<unsigned int>(val);
|
Qt3/Qt4:
- don't save geometry values of the maximized lyx window
- save/restore the maximized property of the lyx window
- fix changed lyx_gui::start interface for xform and gtk
Index: frontends/gtk/lyx_gui.C
===================================================================
--- frontends/gtk/lyx_gui.C (revision 14083)
+++ frontends/gtk/lyx_gui.C (working copy)
@@ -123,7 +123,7 @@
void lyx_gui::start(string const & batch, std::vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool)
{
boost::shared_ptr<GView> view_ptr(new GView);
LyX::ref().addLyXView(view_ptr);
Index: frontends/qt3/lyx_gui.C
===================================================================
--- frontends/qt3/lyx_gui.C (revision 14083)
+++ frontends/qt3/lyx_gui.C (working copy)
@@ -222,12 +222,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool isMax)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C (revision 14083)
+++ frontends/qt3/QtView.C (working copy)
@@ -55,10 +55,13 @@
-QtView::QtView(unsigned int width, unsigned int height)
+QtView::QtView(unsigned int width, unsigned int height, bool isMax)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
+
+ if(isMax)
+ this->setWindowState(WindowMaximized);
qApp->setMainWidget(this);
@@ -160,6 +163,9 @@
void QtView::closeEvent(QCloseEvent *)
{
+ LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
+ //don't save maximized values
+ this->showNormal();
// save windows size and position
LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(height()));
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h (revision 14083)
+++ frontends/qt3/QtView.h (working copy)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h);
+ QtView(unsigned int w, unsigned int h, bool isMax);
~QtView();
Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C (revision 14083)
+++ frontends/qt4/lyx_gui.C (working copy)
@@ -228,12 +228,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool isMax)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt4/QtView.C
===================================================================
--- frontends/qt4/QtView.C (revision 14083)
+++ frontends/qt4/QtView.C (working copy)
@@ -70,11 +70,14 @@
} // namespace anon
-QtView::QtView(unsigned int width, unsigned int height)
+QtView::QtView(unsigned int width, unsigned int height, bool isMax)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
+ if(isMax)
+ this->setWindowState(Qt::WindowMaximized);
+
mainWidget_ = this;
// setToolButtonStyle(Qt::ToolButtonIconOnly);
@@ -182,11 +185,12 @@
void QtView::closeEvent(QCloseEvent *)
{
// save windows size and position
- LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
- LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(height()));
+ LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(this->normalGeometry().width()));
+ LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(this->normalGeometry().height()));
+ LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
if (lyxrc.geometry_xysaved) {
- LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(x()));
- LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(y()));
+ LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(this->normalGeometry().x()));
+ LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(this->normalGeometry().y()));
}
// trigger LFUN_LYX_QUIT instead of quit directly
// since LFUN_LYX_QUIT may have more cleanup stuff
Index: frontends/qt4/QtView.h
===================================================================
--- frontends/qt4/QtView.h (revision 14083)
+++ frontends/qt4/QtView.h (working copy)
@@ -47,7 +47,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h);
+ QtView(unsigned int w, unsigned int h, bool isMax);
~QtView();
Index: frontends/xforms/lyx_gui.C
===================================================================
--- frontends/xforms/lyx_gui.C (revision 14083)
+++ frontends/xforms/lyx_gui.C (working copy)
@@ -256,7 +256,7 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool)
{
int const geometryBitmask =
XParseGeometry(geometry, &posx, &posy, &width, &height);
Index: frontends/lyx_gui.h
===================================================================
--- frontends/lyx_gui.h (revision 14083)
+++ frontends/lyx_gui.h (working copy)
@@ -57,7 +57,7 @@
* batch commands, and loading the given documents
*/
void start(std::string const & batch, std::vector<std::string> const & files,
- unsigned int width, unsigned int height, int posx, int posy);
+ unsigned int width, unsigned int height, int posx, int posy, bool isMax);
/**
* Enter the main event loop (\sa LyX::exec2)
Index: lyx_main.C
===================================================================
--- lyx_main.C (revision 14083)
+++ lyx_main.C (working copy)
@@ -307,6 +307,7 @@
// initial geometry
unsigned int width = 690;
unsigned int height = 510;
+ bool isMax = false;
// first try lyxrc
if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
width = lyxrc.geometry_width;
@@ -320,6 +321,8 @@
val = session().loadSessionInfo("WindowHeight");
if (!val.empty())
height = convert<unsigned int>(val);
+ if (session().loadSessionInfo("WindowIsMaximized") == "yes")
+ isMax = true;
}
// if user wants to restore window position
int posx = -1;
@@ -332,7 +335,7 @@
if (!val.empty())
posy = convert<int>(val);
}
- lyx_gui::start(batch_command, files, width, height, posx, posy);
+ lyx_gui::start(batch_command, files, width, height, posx, posy, isMax);
} else {
// Something went wrong above
quitLyX(false);
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14088 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 08:05:00 +00:00
|
|
|
|
if (session().loadSessionInfo("WindowIsMaximized") == "yes")
|
coding style and readability corrections
Index: frontends/qt3/lyx_gui.C
===================================================================
--- frontends/qt3/lyx_gui.C (revision 14088)
+++ frontends/qt3/lyx_gui.C (working copy)
@@ -222,12 +222,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C (revision 14088)
+++ frontends/qt3/QtView.C (working copy)
@@ -55,12 +55,12 @@
-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
- if(isMax)
+ if (maximize)
this->setWindowState(WindowMaximized);
qApp->setMainWidget(this);
@@ -164,7 +164,7 @@
void QtView::closeEvent(QCloseEvent *)
{
LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
- //don't save maximized values
+ // don't save maximized values
this->showNormal();
// save windows size and position
LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h (revision 14088)
+++ frontends/qt3/QtView.h (working copy)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h, bool isMax);
+ QtView(unsigned int w, unsigned int h, bool maximize);
~QtView();
Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C (revision 14088)
+++ frontends/qt4/lyx_gui.C (working copy)
@@ -228,12 +228,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt4/QtView.C
===================================================================
--- frontends/qt4/QtView.C (revision 14088)
+++ frontends/qt4/QtView.C (working copy)
@@ -70,12 +70,12 @@
} // namespace anon
-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
- if(isMax)
+ if (maximize)
this->setWindowState(Qt::WindowMaximized);
mainWidget_ = this;
Index: frontends/qt4/QtView.h
===================================================================
--- frontends/qt4/QtView.h (revision 14088)
+++ frontends/qt4/QtView.h (working copy)
@@ -47,7 +47,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h, bool isMax);
+ QtView(unsigned int w, unsigned int h, bool maximize);
~QtView();
Index: frontends/lyx_gui.h
===================================================================
--- frontends/lyx_gui.h (revision 14088)
+++ frontends/lyx_gui.h (working copy)
@@ -57,7 +57,7 @@
* batch commands, and loading the given documents
*/
void start(std::string const & batch, std::vector<std::string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax);
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize);
/**
* Enter the main event loop (\sa LyX::exec2)
Index: lyx_main.C
===================================================================
--- lyx_main.C (revision 14088)
+++ lyx_main.C (working copy)
@@ -307,7 +307,7 @@
// initial geometry
unsigned int width = 690;
unsigned int height = 510;
- bool isMax = false;
+ bool maximize = false;
// first try lyxrc
if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
width = lyxrc.geometry_width;
@@ -322,7 +322,7 @@
if (!val.empty())
height = convert<unsigned int>(val);
if (session().loadSessionInfo("WindowIsMaximized") == "yes")
- isMax = true;
+ maximize = true;
}
// if user wants to restore window position
int posx = -1;
@@ -335,7 +335,7 @@
if (!val.empty())
posy = convert<int>(val);
}
- lyx_gui::start(batch_command, files, width, height, posx, posy, isMax);
+ lyx_gui::start(batch_command, files, width, height, posx, posy, maximize);
} else {
// Something went wrong above
quitLyX(false);
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14089 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 08:24:43 +00:00
|
|
|
|
maximize = true;
|
2006-05-29 15:11:19 +00:00
|
|
|
|
}
|
|
|
|
|
// if user wants to restore window position
|
|
|
|
|
int posx = -1;
|
|
|
|
|
int posy = -1;
|
|
|
|
|
if (lyxrc.geometry_xysaved) {
|
2006-06-07 20:08:37 +00:00
|
|
|
|
string val = session().loadSessionInfo("WindowPosX");
|
2006-05-29 15:11:19 +00:00
|
|
|
|
if (!val.empty())
|
|
|
|
|
posx = convert<int>(val);
|
2006-06-07 20:08:37 +00:00
|
|
|
|
val = session().loadSessionInfo("WindowPosY");
|
2006-05-29 15:11:19 +00:00
|
|
|
|
if (!val.empty())
|
|
|
|
|
posy = convert<int>(val);
|
|
|
|
|
}
|
2006-06-21 10:30:32 +00:00
|
|
|
|
|
|
|
|
|
if (geometryOption_) {
|
2006-06-26 18:07:10 +00:00
|
|
|
|
width = 0;
|
|
|
|
|
height = 0;
|
2006-06-21 10:30:32 +00:00
|
|
|
|
}
|
2006-07-27 14:13:45 +00:00
|
|
|
|
// create the main window
|
|
|
|
|
LyXView * view = lyx_gui::create_view(width, height, posx, posy, maximize);
|
2006-09-09 15:27:44 +00:00
|
|
|
|
|
2006-07-27 14:13:45 +00:00
|
|
|
|
// 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();
|
2006-06-21 10:30:32 +00:00
|
|
|
|
|
2006-07-27 14:13:45 +00:00
|
|
|
|
return lyx_gui::start(view, batch_command);
|
2006-05-29 15:11:19 +00:00
|
|
|
|
} else {
|
2005-05-19 09:44:20 +00:00
|
|
|
|
// Something went wrong above
|
2006-04-09 00:26:19 +00:00
|
|
|
|
quitLyX(false);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return EXIT_FAILURE;
|
2005-05-19 09:44:20 +00:00
|
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-06-24 20:28:12 +00:00
|
|
|
|
|
2005-01-19 14:17:36 +00:00
|
|
|
|
/*
|
|
|
|
|
Signals and Windows
|
|
|
|
|
===================
|
|
|
|
|
The SIGHUP signal does not exist on Windows and does not need to be handled.
|
|
|
|
|
|
|
|
|
|
Windows handles SIGFPE and SIGSEGV signals as expected.
|
|
|
|
|
|
|
|
|
|
Cntl+C interrupts (mapped to SIGINT by Windows' POSIX compatability layer)
|
|
|
|
|
cause a new thread to be spawned. This may well result in unexpected
|
|
|
|
|
behaviour by the single-threaded LyX.
|
|
|
|
|
|
|
|
|
|
SIGTERM signals will come only from another process actually sending
|
|
|
|
|
that signal using 'raise' in Windows' POSIX compatability layer. It will
|
|
|
|
|
not come from the general "terminate process" methods that everyone
|
|
|
|
|
actually uses (and which can't be trapped). Killing an app 'politely' on
|
|
|
|
|
Windows involves first sending a WM_CLOSE message, something that is
|
|
|
|
|
caught already by the Qt frontend.
|
|
|
|
|
|
|
|
|
|
For more information see:
|
|
|
|
|
|
|
|
|
|
http://aspn.activestate.com/ASPN/Mail/Message/ActiveTcl/2034055
|
|
|
|
|
...signals are mostly useless on Windows for a variety of reasons that are
|
|
|
|
|
Windows specific...
|
|
|
|
|
|
|
|
|
|
'UNIX Application Migration Guide, Chapter 9'
|
|
|
|
|
http://msdn.microsoft.com/library/en-us/dnucmg/html/UCMGch09.asp
|
|
|
|
|
|
|
|
|
|
'How To Terminate an Application "Cleanly" in Win32'
|
|
|
|
|
http://support.microsoft.com/default.aspx?scid=kb;en-us;178893
|
|
|
|
|
*/
|
2001-09-09 22:02:19 +00:00
|
|
|
|
extern "C" {
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
static void error_handler(int err_sig)
|
2001-09-09 22:02:19 +00:00
|
|
|
|
{
|
2004-03-22 13:09:59 +00:00
|
|
|
|
// Throw away any signals other than the first one received.
|
|
|
|
|
static sig_atomic_t handling_error = false;
|
|
|
|
|
if (handling_error)
|
|
|
|
|
return;
|
|
|
|
|
handling_error = true;
|
|
|
|
|
|
|
|
|
|
// We have received a signal indicating a fatal error, so
|
|
|
|
|
// try and save the data ASAP.
|
|
|
|
|
LyX::cref().emergencyCleanup();
|
|
|
|
|
|
|
|
|
|
// These lyxerr calls may or may not work:
|
|
|
|
|
|
|
|
|
|
// Signals are asynchronous, so the main program may be in a very
|
|
|
|
|
// fragile state when a signal is processed and thus while a signal
|
|
|
|
|
// handler function executes.
|
|
|
|
|
// In general, therefore, we should avoid performing any
|
|
|
|
|
// I/O operations or calling most library and system functions from
|
|
|
|
|
// signal handlers.
|
|
|
|
|
|
|
|
|
|
// This shouldn't matter here, however, as we've already invoked
|
|
|
|
|
// emergencyCleanup.
|
2001-09-09 22:02:19 +00:00
|
|
|
|
switch (err_sig) {
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#ifdef SIGHUP
|
2001-09-09 22:02:19 +00:00
|
|
|
|
case SIGHUP:
|
2004-03-22 13:09:59 +00:00
|
|
|
|
lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl;
|
2001-09-09 22:02:19 +00:00
|
|
|
|
break;
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#endif
|
2001-09-09 22:02:19 +00:00
|
|
|
|
case SIGFPE:
|
2004-03-22 13:09:59 +00:00
|
|
|
|
lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl;
|
2001-09-09 22:02:19 +00:00
|
|
|
|
break;
|
|
|
|
|
case SIGSEGV:
|
2004-03-22 13:09:59 +00:00
|
|
|
|
lyxerr << "\nlyx: SIGSEGV signal caught\n"
|
2006-04-05 23:56:29 +00:00
|
|
|
|
"Sorry, you have found a bug in LyX. "
|
|
|
|
|
"Please read the bug-reporting instructions "
|
|
|
|
|
"in Help->Introduction and send us a bug report, "
|
|
|
|
|
"if necessary. Thanks !\nBye." << endl;
|
2001-09-09 22:02:19 +00:00
|
|
|
|
break;
|
2004-03-22 13:09:59 +00:00
|
|
|
|
case SIGINT:
|
2001-09-09 22:02:19 +00:00
|
|
|
|
case SIGTERM:
|
|
|
|
|
// no comments
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2001-09-09 22:02:19 +00:00
|
|
|
|
// Deinstall the signal handlers
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#ifdef SIGHUP
|
2001-09-09 22:02:19 +00:00
|
|
|
|
signal(SIGHUP, SIG_DFL);
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#endif
|
2001-09-09 22:02:19 +00:00
|
|
|
|
signal(SIGINT, SIG_DFL);
|
|
|
|
|
signal(SIGFPE, SIG_DFL);
|
|
|
|
|
signal(SIGSEGV, SIG_DFL);
|
|
|
|
|
signal(SIGTERM, SIG_DFL);
|
|
|
|
|
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#ifdef SIGHUP
|
2004-03-22 13:09:59 +00:00
|
|
|
|
if (err_sig == SIGSEGV ||
|
2005-02-15 13:45:41 +00:00
|
|
|
|
(err_sig != SIGHUP && !getEnv("LYXDEBUG").empty()))
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#else
|
2005-02-15 13:45:41 +00:00
|
|
|
|
if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty())
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#endif
|
2003-06-30 23:56:22 +00:00
|
|
|
|
lyx::support::abort();
|
2001-09-09 22:02:19 +00:00
|
|
|
|
exit(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2003-06-20 23:03:43 +00:00
|
|
|
|
void LyX::printError(ErrorItem const & ei)
|
|
|
|
|
{
|
2006-09-11 08:54:10 +00:00
|
|
|
|
docstring tmp = _("LyX: ") + ei.error + lyx::char_type(':')
|
|
|
|
|
+ ei.description;
|
|
|
|
|
std::cerr << lyx::to_utf8(tmp) << std::endl;
|
2003-06-20 23:03:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-07-05 17:01:26 +00:00
|
|
|
|
bool LyX::init()
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#ifdef SIGHUP
|
2000-05-21 18:40:10 +00:00
|
|
|
|
signal(SIGHUP, error_handler);
|
2005-01-19 14:17:36 +00:00
|
|
|
|
#endif
|
2000-05-21 18:40:10 +00:00
|
|
|
|
signal(SIGFPE, error_handler);
|
|
|
|
|
signal(SIGSEGV, error_handler);
|
|
|
|
|
signal(SIGINT, error_handler);
|
|
|
|
|
signal(SIGTERM, error_handler);
|
2004-03-22 13:09:59 +00:00
|
|
|
|
// SIGPIPE can be safely ignored.
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2005-01-10 19:17:43 +00:00
|
|
|
|
lyxrc.tempdir_path = package().temp_dir();
|
|
|
|
|
lyxrc.document_path = package().document_dir();
|
2005-01-12 10:30:46 +00:00
|
|
|
|
|
2001-12-28 13:26:54 +00:00
|
|
|
|
if (lyxrc.template_path.empty()) {
|
2006-04-08 22:31:11 +00:00
|
|
|
|
lyxrc.template_path = addPath(package().system_support(),
|
2005-01-10 19:17:43 +00:00
|
|
|
|
"templates");
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2003-03-31 02:59:34 +00:00
|
|
|
|
if (lyxrc.roman_font_name.empty())
|
|
|
|
|
lyxrc.roman_font_name = lyx_gui::roman_font_name();
|
|
|
|
|
if (lyxrc.sans_font_name.empty())
|
|
|
|
|
lyxrc.sans_font_name = lyx_gui::sans_font_name();
|
|
|
|
|
if (lyxrc.typewriter_font_name.empty())
|
|
|
|
|
lyxrc.typewriter_font_name = lyx_gui::typewriter_font_name();
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
//
|
|
|
|
|
// Read configuration files
|
|
|
|
|
//
|
|
|
|
|
|
2006-05-02 12:53:48 +00:00
|
|
|
|
// This one may have been distributed along with LyX.
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!readRcFile("lyxrc.dist"))
|
|
|
|
|
return false;
|
2006-05-09 15:41:42 +00:00
|
|
|
|
|
|
|
|
|
// Set the PATH correctly.
|
|
|
|
|
#if !defined (USE_POSIX_PACKAGING)
|
|
|
|
|
// Add the directory containing the LyX executable to the path
|
|
|
|
|
// so that LyX can find things like tex2lyx.
|
|
|
|
|
if (package().build_support().empty())
|
|
|
|
|
prependEnvPath("PATH", package().binary_dir());
|
|
|
|
|
#endif
|
|
|
|
|
if (!lyxrc.path_prefix.empty())
|
|
|
|
|
prependEnvPath("PATH", lyxrc.path_prefix);
|
|
|
|
|
|
2006-09-09 15:27:44 +00:00
|
|
|
|
// Check that user LyX directory is ok.
|
2006-08-11 22:11:33 +00:00
|
|
|
|
if (queryUserLyXDir(package().explicit_user_support()))
|
|
|
|
|
reconfigureUserLyXDir();
|
|
|
|
|
|
|
|
|
|
// no need for a splash when there is no GUI
|
|
|
|
|
if (!lyx_gui::use_gui) {
|
2006-05-09 15:41:42 +00:00
|
|
|
|
first_start = false;
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-02 12:53:48 +00:00
|
|
|
|
// This one is generated in user_support directory by lib/configure.py.
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!readRcFile("lyxrc.defaults"))
|
|
|
|
|
return false;
|
2006-05-02 12:53:48 +00:00
|
|
|
|
|
2006-05-17 22:13:33 +00:00
|
|
|
|
// Query the OS to know what formats are viewed natively
|
|
|
|
|
formats.setAutoOpen();
|
|
|
|
|
|
2000-10-10 14:17:33 +00:00
|
|
|
|
system_lyxrc = lyxrc;
|
2000-11-06 11:20:22 +00:00
|
|
|
|
system_formats = formats;
|
2000-11-13 10:35:02 +00:00
|
|
|
|
system_converters = converters;
|
2004-10-26 18:39:13 +00:00
|
|
|
|
system_movers = movers;
|
2000-11-15 18:02:45 +00:00
|
|
|
|
system_lcolor = lcolor;
|
2000-11-06 11:20:22 +00:00
|
|
|
|
|
2006-05-02 12:53:48 +00:00
|
|
|
|
// This one is edited through the preferences dialog.
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!readRcFile("preferences"))
|
|
|
|
|
return false;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!readEncodingsFile("encodings"))
|
|
|
|
|
return false;
|
|
|
|
|
if (!readLanguagesFile("languages"))
|
|
|
|
|
return false;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
|
|
|
|
|
// Load the layouts
|
|
|
|
|
lyxerr[Debug::INIT] << "Reading layouts..." << endl;
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!LyXSetStyle())
|
|
|
|
|
return false;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
|
2006-06-07 20:08:37 +00:00
|
|
|
|
if (lyx_gui::use_gui) {
|
2003-07-26 23:04:39 +00:00
|
|
|
|
// Set up bindings
|
|
|
|
|
toplevel_keymap.reset(new kb_keymap);
|
|
|
|
|
defaultKeyBindings(toplevel_keymap.get());
|
|
|
|
|
toplevel_keymap->read(lyxrc.bind_file);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2003-07-26 23:04:39 +00:00
|
|
|
|
// Read menus
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!readUIFile(lyxrc.ui_file))
|
|
|
|
|
return false;
|
2003-07-26 23:04:39 +00:00
|
|
|
|
}
|
2000-05-10 11:50:11 +00:00
|
|
|
|
|
2003-04-02 18:08:05 +00:00
|
|
|
|
if (lyxerr.debugging(Debug::LYXRC))
|
2000-03-12 10:35:05 +00:00
|
|
|
|
lyxrc.print();
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2006-06-27 10:51:24 +00:00
|
|
|
|
os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);
|
2005-02-13 17:12:34 +00:00
|
|
|
|
if (!lyxrc.path_prefix.empty())
|
|
|
|
|
prependEnvPath("PATH", lyxrc.path_prefix);
|
2005-01-16 21:01:41 +00:00
|
|
|
|
|
2005-02-01 16:41:24 +00:00
|
|
|
|
if (fs::exists(lyxrc.document_path) &&
|
|
|
|
|
fs::is_directory(lyxrc.document_path))
|
2005-01-16 21:01:41 +00:00
|
|
|
|
package().document_dir() = lyxrc.document_path;
|
2005-01-10 19:17:43 +00:00
|
|
|
|
|
|
|
|
|
package().temp_dir() = createLyXTmpDir(lyxrc.tempdir_path);
|
|
|
|
|
if (package().temp_dir().empty()) {
|
2006-09-11 08:54:10 +00:00
|
|
|
|
Alert::error(_("Could not create temporary directory"),
|
|
|
|
|
bformat(_("Could not create a temporary directory in\n"
|
2006-09-09 15:27:44 +00:00
|
|
|
|
"%1$s. Make sure that this\n"
|
2006-09-11 08:54:10 +00:00
|
|
|
|
"path exists and is writable and try again."),
|
|
|
|
|
lyx::from_utf8(lyxrc.tempdir_path)));
|
2004-02-25 12:00:53 +00:00
|
|
|
|
// createLyXTmpDir() tries sufficiently hard to create a
|
|
|
|
|
// usable temp dir, so the probability to come here is
|
|
|
|
|
// 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.
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return false;
|
2004-02-25 12:00:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
1999-10-07 18:44:17 +00:00
|
|
|
|
if (lyxerr.debugging(Debug::INIT)) {
|
2005-01-10 19:17:43 +00:00
|
|
|
|
lyxerr << "LyX tmp dir: `" << package().temp_dir() << '\'' << endl;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-04-05 22:56:18 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "Reading session information '.lyx/session'..." << endl;
|
|
|
|
|
session_.reset(new lyx::Session(lyxrc.num_lastfiles));
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return true;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-10-11 21:06:43 +00:00
|
|
|
|
|
2000-05-10 11:50:11 +00:00
|
|
|
|
void LyX::defaultKeyBindings(kb_keymap * kbmap)
|
|
|
|
|
{
|
2006-05-05 20:23:12 +00:00
|
|
|
|
kbmap->bind("Right", FuncRequest(LFUN_CHAR_FORWARD));
|
|
|
|
|
kbmap->bind("Left", FuncRequest(LFUN_CHAR_BACKWARD));
|
2003-09-21 23:00:47 +00:00
|
|
|
|
kbmap->bind("Up", FuncRequest(LFUN_UP));
|
|
|
|
|
kbmap->bind("Down", FuncRequest(LFUN_DOWN));
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2003-09-21 23:00:47 +00:00
|
|
|
|
kbmap->bind("Tab", FuncRequest(LFUN_CELL_FORWARD));
|
2005-03-21 11:14:54 +00:00
|
|
|
|
kbmap->bind("C-Tab", FuncRequest(LFUN_CELL_SPLIT));
|
|
|
|
|
kbmap->bind("~S-ISO_Left_Tab", FuncRequest(LFUN_CELL_BACKWARD));
|
|
|
|
|
kbmap->bind("~S-BackTab", FuncRequest(LFUN_CELL_BACKWARD));
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
kbmap->bind("Home", FuncRequest(LFUN_LINE_BEGIN));
|
|
|
|
|
kbmap->bind("End", FuncRequest(LFUN_LINE_END));
|
|
|
|
|
kbmap->bind("Prior", FuncRequest(LFUN_SCREEN_UP));
|
|
|
|
|
kbmap->bind("Next", FuncRequest(LFUN_SCREEN_DOWN));
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-05-05 20:23:12 +00:00
|
|
|
|
kbmap->bind("Return", FuncRequest(LFUN_BREAK_PARAGRAPH));
|
2003-09-21 23:00:47 +00:00
|
|
|
|
//kbmap->bind("~C-~S-~M-nobreakspace", FuncRequest(LFUN_PROTECTEDSPACE));
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-05-08 18:09:19 +00:00
|
|
|
|
kbmap->bind("Delete", FuncRequest(LFUN_CHAR_DELETE_FORWARD));
|
|
|
|
|
kbmap->bind("BackSpace", FuncRequest(LFUN_CHAR_DELETE_BACKWARD));
|
2001-12-12 14:37:59 +00:00
|
|
|
|
|
2000-05-10 11:50:11 +00:00
|
|
|
|
// kbmap->bindings to enable the use of the numeric keypad
|
|
|
|
|
// e.g. Num Lock set
|
2006-05-05 20:23:12 +00:00
|
|
|
|
//kbmap->bind("KP_0", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_Decimal", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
kbmap->bind("KP_Enter", FuncRequest(LFUN_BREAK_PARAGRAPH));
|
|
|
|
|
//kbmap->bind("KP_1", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_2", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_3", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_4", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_5", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_6", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_Add", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_7", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_8", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_9", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_Divide", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_Multiply", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
//kbmap->bind("KP_Subtract", FuncRequest(LFUN_SELF_INSERT));
|
|
|
|
|
kbmap->bind("KP_Right", FuncRequest(LFUN_CHAR_FORWARD));
|
|
|
|
|
kbmap->bind("KP_Left", FuncRequest(LFUN_CHAR_BACKWARD));
|
2003-09-21 23:00:47 +00:00
|
|
|
|
kbmap->bind("KP_Up", FuncRequest(LFUN_UP));
|
|
|
|
|
kbmap->bind("KP_Down", FuncRequest(LFUN_DOWN));
|
2006-05-05 20:23:12 +00:00
|
|
|
|
kbmap->bind("KP_Home", FuncRequest(LFUN_LINE_BEGIN));
|
|
|
|
|
kbmap->bind("KP_End", FuncRequest(LFUN_LINE_END));
|
|
|
|
|
kbmap->bind("KP_Prior", FuncRequest(LFUN_SCREEN_UP));
|
|
|
|
|
kbmap->bind("KP_Next", FuncRequest(LFUN_SCREEN_DOWN));
|
2000-05-10 11:50:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-10-11 21:06:43 +00:00
|
|
|
|
|
2003-10-14 21:30:23 +00:00
|
|
|
|
void LyX::emergencyCleanup() const
|
2001-10-19 15:13:49 +00:00
|
|
|
|
{
|
|
|
|
|
// what to do about tmpfiles is non-obvious. we would
|
|
|
|
|
// like to delete any we find, but our lyxdir might
|
|
|
|
|
// contain documents etc. which might be helpful on
|
|
|
|
|
// a crash
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2001-10-19 15:13:49 +00:00
|
|
|
|
bufferlist.emergencyWriteAll();
|
|
|
|
|
if (lyxserver)
|
|
|
|
|
lyxserver->emergencyCleanup();
|
|
|
|
|
}
|
|
|
|
|
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2000-05-10 11:50:11 +00:00
|
|
|
|
void LyX::deadKeyBindings(kb_keymap * kbmap)
|
|
|
|
|
{
|
|
|
|
|
// bindKeyings for transparent handling of deadkeys
|
|
|
|
|
// The keysyms are gotten from XFree86 X11R6
|
2006-05-05 20:23:12 +00:00
|
|
|
|
kbmap->bind("~C-~S-~M-dead_acute", FuncRequest(LFUN_ACCENT_ACUTE));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_breve", FuncRequest(LFUN_ACCENT_BREVE));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_caron", FuncRequest(LFUN_ACCENT_CARON));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_cedilla", FuncRequest(LFUN_ACCENT_CEDILLA));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_abovering", FuncRequest(LFUN_ACCENT_CIRCLE));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_circumflex", FuncRequest(LFUN_ACCENT_CIRCUMFLEX));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_abovedot", FuncRequest(LFUN_ACCENT_DOT));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_grave", FuncRequest(LFUN_ACCENT_GRAVE));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_doubleacute", FuncRequest(LFUN_ACCENT_HUNGARIAN_UMLAUT));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_macron", FuncRequest(LFUN_ACCENT_MACRON));
|
2000-05-10 11:50:11 +00:00
|
|
|
|
// nothing with this name
|
2006-05-05 20:23:12 +00:00
|
|
|
|
// kbmap->bind("~C-~S-~M-dead_special_caron", LFUN_ACCENT_SPECIAL_CARON);
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_tilde", FuncRequest(LFUN_ACCENT_TILDE));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_diaeresis", FuncRequest(LFUN_ACCENT_UMLAUT));
|
2000-05-10 11:50:11 +00:00
|
|
|
|
// nothing with this name either...
|
2006-05-05 20:23:12 +00:00
|
|
|
|
//kbmap->bind("~C-~S-~M-dead_underbar", FuncRequest(LFUN_ACCENT_UNDERBAR));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_belowdot", FuncRequest(LFUN_ACCENT_UNDERDOT));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_tie", FuncRequest(LFUN_ACCENT_TIE));
|
|
|
|
|
kbmap->bind("~C-~S-~M-dead_ogonek",FuncRequest(LFUN_ACCENT_OGONEK));
|
2000-05-10 11:50:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-05-09 15:41:42 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
|
|
// return true if file does not exist or is older than configure.py.
|
|
|
|
|
bool needsUpdate(string const & file)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2006-05-09 15:41:42 +00:00
|
|
|
|
static string const configure_script =
|
|
|
|
|
addName(package().system_support(), "configure.py");
|
|
|
|
|
string const absfile =
|
|
|
|
|
addName(package().user_support(), file);
|
|
|
|
|
|
|
|
|
|
return (! fs::exists(absfile))
|
2006-09-09 15:27:44 +00:00
|
|
|
|
|| (fs::last_write_time(configure_script)
|
2006-05-09 15:41:42 +00:00
|
|
|
|
> fs::last_write_time(absfile));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2002-10-07 13:31:37 +00:00
|
|
|
|
|
2006-05-09 15:41:42 +00:00
|
|
|
|
bool LyX::queryUserLyXDir(bool explicit_userdir)
|
|
|
|
|
{
|
1999-09-27 18:44:28 +00:00
|
|
|
|
// Does user directory exist?
|
2005-02-01 16:41:24 +00:00
|
|
|
|
if (fs::exists(package().user_support()) &&
|
|
|
|
|
fs::is_directory(package().user_support())) {
|
1999-09-27 18:44:28 +00:00
|
|
|
|
first_start = false;
|
2006-09-09 15:27:44 +00:00
|
|
|
|
|
|
|
|
|
return needsUpdate("lyxrc.defaults")
|
|
|
|
|
|| needsUpdate("textclass.lst")
|
2006-05-09 15:41:42 +00:00
|
|
|
|
|| needsUpdate("packages.lst");
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
2002-08-11 16:27:10 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
first_start = !explicit_userdir;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2005-01-10 19:17:43 +00:00
|
|
|
|
// If the user specified explicitly a directory, ask whether
|
|
|
|
|
// to create it. If the user says "no", then exit.
|
|
|
|
|
if (explicit_userdir &&
|
2005-03-18 16:17:05 +00:00
|
|
|
|
Alert::prompt(
|
2006-09-11 08:54:10 +00:00
|
|
|
|
_("Missing user LyX directory"),
|
|
|
|
|
bformat(_("You have specified a non-existent user "
|
2006-09-09 15:27:44 +00:00
|
|
|
|
"LyX directory, %1$s.\n"
|
2006-09-11 08:54:10 +00:00
|
|
|
|
"It is needed to keep your own configuration."),
|
|
|
|
|
lyx::from_utf8(package().user_support())),
|
2005-01-10 19:17:43 +00:00
|
|
|
|
1, 0,
|
2006-09-11 08:54:10 +00:00
|
|
|
|
_("&Create directory"),
|
|
|
|
|
_("&Exit LyX"))) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("No user LyX directory. Exiting.")) << endl;
|
2006-06-07 20:08:37 +00:00
|
|
|
|
lyx_exit(EXIT_FAILURE);
|
2005-01-10 19:17:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-09-11 08:54:10 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(bformat(_("LyX: Creating directory %1$s"),
|
|
|
|
|
lyx::from_utf8(package().user_support())))
|
2005-01-16 21:01:41 +00:00
|
|
|
|
<< endl;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
2005-01-10 19:17:43 +00:00
|
|
|
|
if (!createDirectory(package().user_support(), 0755)) {
|
|
|
|
|
// Failed, so let's exit.
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("Failed to create directory. Exiting."))
|
2005-01-10 19:17:43 +00:00
|
|
|
|
<< endl;
|
2006-06-07 20:08:37 +00:00
|
|
|
|
lyx_exit(EXIT_FAILURE);
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-05-09 15:41:42 +00:00
|
|
|
|
return true;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-07-05 17:01:26 +00:00
|
|
|
|
bool LyX::readRcFile(string const & name)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2006-05-02 12:53:48 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "About to read " << name << "... ";
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-04-08 22:31:11 +00:00
|
|
|
|
string const lyxrc_path = libFileSearch(string(), name);
|
2002-02-16 15:59:55 +00:00
|
|
|
|
if (!lyxrc_path.empty()) {
|
2003-04-02 18:08:05 +00:00
|
|
|
|
|
2006-05-02 12:53:48 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "Found in " << lyxrc_path << endl;
|
2003-04-02 18:08:05 +00:00
|
|
|
|
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (lyxrc.read(lyxrc_path) < 0) {
|
2006-05-02 12:53:48 +00:00
|
|
|
|
showFileError(name);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2006-05-02 12:53:48 +00:00
|
|
|
|
} else
|
|
|
|
|
lyxerr[Debug::INIT] << "Not found." << lyxrc_path << endl;
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return true;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2000-07-24 13:53:19 +00:00
|
|
|
|
// Read the ui file `name'
|
2006-07-05 17:01:26 +00:00
|
|
|
|
bool LyX::readUIFile(string const & name)
|
2000-07-24 13:53:19 +00:00
|
|
|
|
{
|
|
|
|
|
enum Uitags {
|
|
|
|
|
ui_menuset = 1,
|
|
|
|
|
ui_toolbar,
|
2003-06-11 19:21:46 +00:00
|
|
|
|
ui_toolbars,
|
2003-04-15 02:28:53 +00:00
|
|
|
|
ui_include,
|
2000-07-24 13:53:19 +00:00
|
|
|
|
ui_last
|
|
|
|
|
};
|
|
|
|
|
|
2002-08-11 16:27:10 +00:00
|
|
|
|
struct keyword_item uitags[ui_last - 1] = {
|
2003-04-15 02:28:53 +00:00
|
|
|
|
{ "include", ui_include },
|
2000-07-24 13:53:19 +00:00
|
|
|
|
{ "menuset", ui_menuset },
|
2003-06-11 19:21:46 +00:00
|
|
|
|
{ "toolbar", ui_toolbar },
|
|
|
|
|
{ "toolbars", ui_toolbars }
|
2000-07-24 13:53:19 +00:00
|
|
|
|
};
|
|
|
|
|
|
2003-04-15 02:28:53 +00:00
|
|
|
|
// 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);
|
|
|
|
|
if (it != end) {
|
|
|
|
|
lyxerr[Debug::INIT] << "UI file '" << name
|
|
|
|
|
<< "' has been read already. "
|
|
|
|
|
<< "Is this an include loop?"
|
|
|
|
|
<< endl;
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return false;
|
2003-04-15 02:28:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-07-24 13:53:19 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2006-04-08 22:31:11 +00:00
|
|
|
|
string const ui_path = libFileSearch("ui", name, "ui");
|
2000-07-24 13:53:19 +00:00
|
|
|
|
|
|
|
|
|
if (ui_path.empty()) {
|
2002-03-21 17:27:08 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "Could not find " << name << endl;
|
2003-04-02 18:08:05 +00:00
|
|
|
|
showFileError(name);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return false;
|
2000-07-24 13:53:19 +00:00
|
|
|
|
}
|
2003-04-15 02:28:53 +00:00
|
|
|
|
uifiles.push_back(name);
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2000-07-24 13:53:19 +00:00
|
|
|
|
lyxerr[Debug::INIT] << "Found " << name
|
|
|
|
|
<< " in " << ui_path << endl;
|
|
|
|
|
LyXLex lex(uitags, ui_last - 1);
|
|
|
|
|
lex.setFile(ui_path);
|
2001-08-07 07:36:56 +00:00
|
|
|
|
if (!lex.isOK()) {
|
2000-07-24 21:49:58 +00:00
|
|
|
|
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
|
|
|
|
|
<< endl;
|
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
2000-07-24 13:53:19 +00:00
|
|
|
|
if (lyxerr.debugging(Debug::PARSER))
|
|
|
|
|
lex.printTable(lyxerr);
|
|
|
|
|
|
2001-08-07 07:36:56 +00:00
|
|
|
|
while (lex.isOK()) {
|
2000-11-04 10:00:12 +00:00
|
|
|
|
switch (lex.lex()) {
|
2003-04-15 02:28:53 +00:00
|
|
|
|
case ui_include: {
|
|
|
|
|
lex.next(true);
|
|
|
|
|
string const file = lex.getString();
|
2006-07-05 17:01:26 +00:00
|
|
|
|
if (!readUIFile(file))
|
|
|
|
|
return false;
|
2003-04-15 02:28:53 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2002-03-21 17:27:08 +00:00
|
|
|
|
case ui_menuset:
|
2000-07-24 13:53:19 +00:00
|
|
|
|
menubackend.read(lex);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ui_toolbar:
|
2003-04-02 18:08:05 +00:00
|
|
|
|
toolbarbackend.read(lex);
|
2000-07-24 13:53:19 +00:00
|
|
|
|
break;
|
|
|
|
|
|
2003-06-11 19:21:46 +00:00
|
|
|
|
case ui_toolbars:
|
|
|
|
|
toolbarbackend.readToolbars(lex);
|
|
|
|
|
break;
|
|
|
|
|
|
2000-07-24 13:53:19 +00:00
|
|
|
|
default:
|
2002-07-28 22:50:13 +00:00
|
|
|
|
if (!rtrim(lex.getString()).empty())
|
2001-05-03 15:38:24 +00:00
|
|
|
|
lex.printError("LyX::ReadUIFile: "
|
|
|
|
|
"Unknown menu tag: `$$Token'");
|
2000-07-24 13:53:19 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return true;
|
2000-07-24 13:53:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2000-10-10 12:36:36 +00:00
|
|
|
|
// Read the languages file `name'
|
2006-07-05 17:01:26 +00:00
|
|
|
|
bool LyX::readLanguagesFile(string const & name)
|
2000-10-10 12:36:36 +00:00
|
|
|
|
{
|
|
|
|
|
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
|
|
|
|
|
|
2006-04-08 22:31:11 +00:00
|
|
|
|
string const lang_path = libFileSearch(string(), name);
|
2000-10-10 12:36:36 +00:00
|
|
|
|
if (lang_path.empty()) {
|
2003-04-02 18:08:05 +00:00
|
|
|
|
showFileError(name);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return false;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
}
|
|
|
|
|
languages.read(lang_path);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return true;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Read the encodings file `name'
|
2006-07-05 17:01:26 +00:00
|
|
|
|
bool LyX::readEncodingsFile(string const & name)
|
2000-10-10 12:36:36 +00:00
|
|
|
|
{
|
|
|
|
|
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
|
|
|
|
|
|
2006-04-08 22:31:11 +00:00
|
|
|
|
string const enc_path = libFileSearch(string(), name);
|
2000-10-10 12:36:36 +00:00
|
|
|
|
if (enc_path.empty()) {
|
2003-04-02 18:08:05 +00:00
|
|
|
|
showFileError(name);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return false;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
}
|
|
|
|
|
encodings.read(enc_path);
|
2006-07-05 17:01:26 +00:00
|
|
|
|
return true;
|
2000-10-10 12:36:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
bool is_gui = true;
|
|
|
|
|
string batch;
|
|
|
|
|
|
|
|
|
|
/// return the the number of arguments consumed
|
2002-11-21 18:33:09 +00:00
|
|
|
|
typedef boost::function<int(string const &, string const &)> cmd_helper;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
|
|
|
|
|
int parse_dbg(string const & arg, string const &)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2002-08-07 23:43:38 +00:00
|
|
|
|
if (arg.empty()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("List of supported debug flags:")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
Debug::showTags(lyxerr);
|
|
|
|
|
exit(0);
|
|
|
|
|
}
|
2006-09-11 08:54:10 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(bformat(_("Setting debug level to %1$s"), lyx::from_utf8(arg))) << endl;
|
2002-11-24 15:20:31 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
lyxerr.level(Debug::value(arg));
|
1999-12-13 15:31:52 +00:00
|
|
|
|
Debug::showLevel(lyxerr, lyxerr.level());
|
2002-08-07 23:43:38 +00:00
|
|
|
|
return 1;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-05-13 09:48:57 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
int parse_help(string const &, string const &)
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
1999-10-07 18:44:17 +00:00
|
|
|
|
lyxerr <<
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyx::to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
|
1999-10-07 18:44:17 +00:00
|
|
|
|
"Command line switches (case sensitive):\n"
|
2000-07-04 20:32:37 +00:00
|
|
|
|
"\t-help summarize LyX usage\n"
|
2006-04-01 13:23:24 +00:00
|
|
|
|
"\t-userdir dir set user directory to dir\n"
|
|
|
|
|
"\t-sysdir dir set system directory to dir\n"
|
2000-07-05 20:16:38 +00:00
|
|
|
|
"\t-geometry WxH+X+Y set geometry of the main window\n"
|
2002-03-21 17:27:08 +00:00
|
|
|
|
"\t-dbg feature[,feature]...\n"
|
|
|
|
|
" select the features to debug.\n"
|
|
|
|
|
" Type `lyx -dbg' to see the list of features\n"
|
2000-11-30 18:11:54 +00:00
|
|
|
|
"\t-x [--execute] command\n"
|
|
|
|
|
" where command is a lyx command.\n"
|
|
|
|
|
"\t-e [--export] fmt\n"
|
|
|
|
|
" where fmt is the export format of choice.\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"
|
2001-09-11 13:13:03 +00:00
|
|
|
|
"\t-version summarize version and build info\n"
|
2006-09-09 15:27:44 +00:00
|
|
|
|
"Check the LyX man page for more details.")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(0);
|
|
|
|
|
return 0;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
int parse_version(string const &, string const &)
|
2001-09-11 13:13:03 +00:00
|
|
|
|
{
|
2001-10-03 15:49:32 +00:00
|
|
|
|
lyxerr << "LyX " << lyx_version
|
2006-08-16 21:54:55 +00:00
|
|
|
|
<< " (" << lyx_release_date << ")" << endl;
|
2001-09-11 13:13:03 +00:00
|
|
|
|
lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
|
|
|
|
|
|
2001-10-03 15:49:32 +00:00
|
|
|
|
lyxerr << lyx_version_info << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(0);
|
|
|
|
|
return 0;
|
2001-09-11 13:13:03 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
int parse_sysdir(string const & arg, string const &)
|
|
|
|
|
{
|
|
|
|
|
if (arg.empty()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("Missing directory for -sysdir switch")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(1);
|
|
|
|
|
}
|
2005-01-10 19:17:43 +00:00
|
|
|
|
cl_system_support = arg;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int parse_userdir(string const & arg, string const &)
|
|
|
|
|
{
|
|
|
|
|
if (arg.empty()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("Missing directory for -userdir switch")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(1);
|
|
|
|
|
}
|
2005-01-10 19:17:43 +00:00
|
|
|
|
cl_user_support = arg;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int parse_execute(string const & arg, string const &)
|
|
|
|
|
{
|
|
|
|
|
if (arg.empty()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("Missing command string after --execute switch")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(1);
|
|
|
|
|
}
|
|
|
|
|
batch = arg;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int parse_export(string const & type, string const &)
|
|
|
|
|
{
|
|
|
|
|
if (type.empty()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("Missing file type [eg latex, ps...] after "
|
|
|
|
|
"--export switch")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(1);
|
|
|
|
|
}
|
|
|
|
|
batch = "buffer-export " + type;
|
|
|
|
|
is_gui = false;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int parse_import(string const & type, string const & file)
|
|
|
|
|
{
|
|
|
|
|
if (type.empty()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("Missing file type [eg latex, ps...] after "
|
|
|
|
|
"--import switch")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(1);
|
|
|
|
|
}
|
|
|
|
|
if (file.empty()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
|
lyxerr << lyx::to_utf8(_("Missing filename for --import")) << endl;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
exit(1);
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-27 10:30:28 +00:00
|
|
|
|
batch = "buffer-import " + type + ' ' + file;
|
2002-08-07 23:43:38 +00:00
|
|
|
|
return 2;
|
|
|
|
|
}
|
2001-09-11 13:13:03 +00:00
|
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
|
} // namespace anon
|
|
|
|
|
|
2000-10-11 21:06:43 +00:00
|
|
|
|
|
2002-06-12 09:47:10 +00:00
|
|
|
|
bool LyX::easyParse(int & argc, char * argv[])
|
1999-09-27 18:44:28 +00:00
|
|
|
|
{
|
2002-08-07 23:43:38 +00:00
|
|
|
|
std::map<string, cmd_helper> cmdmap;
|
|
|
|
|
|
|
|
|
|
cmdmap["-dbg"] = parse_dbg;
|
|
|
|
|
cmdmap["-help"] = parse_help;
|
|
|
|
|
cmdmap["--help"] = parse_help;
|
|
|
|
|
cmdmap["-version"] = parse_version;
|
|
|
|
|
cmdmap["--version"] = parse_version;
|
|
|
|
|
cmdmap["-sysdir"] = parse_sysdir;
|
|
|
|
|
cmdmap["-userdir"] = parse_userdir;
|
|
|
|
|
cmdmap["-x"] = parse_execute;
|
|
|
|
|
cmdmap["--execute"] = parse_execute;
|
|
|
|
|
cmdmap["-e"] = parse_export;
|
|
|
|
|
cmdmap["--export"] = parse_export;
|
|
|
|
|
cmdmap["-i"] = parse_import;
|
|
|
|
|
cmdmap["--import"] = parse_import;
|
1999-12-10 00:07:59 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
for (int i = 1; i < argc; ++i) {
|
|
|
|
|
std::map<string, cmd_helper>::const_iterator it
|
|
|
|
|
= cmdmap.find(argv[i]);
|
2000-05-29 15:29:50 +00:00
|
|
|
|
|
2006-06-21 10:30:32 +00:00
|
|
|
|
// check for X11 -geometry option
|
|
|
|
|
if (lyx::support::compare(argv[i], "-geometry") == 0)
|
|
|
|
|
geometryOption_ = true;
|
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
// don't complain if not found - may be parsed later
|
|
|
|
|
if (it == cmdmap.end())
|
|
|
|
|
continue;
|
2000-05-29 15:29:50 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
string arg((i + 1 < argc) ? argv[i + 1] : "");
|
|
|
|
|
string arg2((i + 2 < argc) ? argv[i + 2] : "");
|
2002-08-11 16:27:10 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
int const remove = 1 + it->second(arg, arg2);
|
|
|
|
|
|
|
|
|
|
// Now, remove used arguments by shifting
|
|
|
|
|
// the following ones remove places down.
|
|
|
|
|
argc -= remove;
|
|
|
|
|
for (int j = i; j < argc; ++j)
|
|
|
|
|
argv[j] = argv[j + remove];
|
|
|
|
|
--i;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|
2000-04-28 11:18:04 +00:00
|
|
|
|
|
2002-08-07 23:43:38 +00:00
|
|
|
|
batch_command = batch;
|
|
|
|
|
|
|
|
|
|
return is_gui;
|
1999-09-27 18:44:28 +00:00
|
|
|
|
}
|