#include "lyx_main.h"
+#include "ConverterCache.h"
#include "buffer.h"
#include "buffer_funcs.h"
#include "bufferlist.h"
#include "session.h"
#include "LColor.h"
#include "lyx_cb.h"
+#include "LyXAction.h"
#include "lyxfunc.h"
#include "lyxlex.h"
#include "lyxrc.h"
#include "lyxserver.h"
+#include "lyxsocket.h"
#include "lyxtextclasslist.h"
#include "MenuBackend.h"
#include "mover.h"
#include "frontends/Alert.h"
#include "frontends/Application.h"
+#include "frontends/Gui.h"
#include "frontends/LyXView.h"
#include "support/environment.h"
#include "support/package.h"
#include "support/path.h"
#include "support/systemcall.h"
+#include "support/unicode.h"
#include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
#include <iostream>
#include <csignal>
-using lyx::support::addName;
-using lyx::support::addPath;
-using lyx::support::bformat;
-using lyx::support::createDirectory;
-using lyx::support::createLyXTmpDir;
-using lyx::support::fileSearch;
-using lyx::support::getEnv;
-using lyx::support::i18nLibFileSearch;
-using lyx::support::libFileSearch;
-using lyx::support::package;
-using lyx::support::prependEnvPath;
-using lyx::support::rtrim;
-using lyx::support::Systemcall;
-
-using lyx::docstring;
-
-namespace Alert = lyx::frontend::Alert;
-namespace os = lyx::support::os;
+
+namespace lyx {
+
+using support::addName;
+using support::addPath;
+using support::bformat;
+using support::createDirectory;
+using support::createLyXTmpDir;
+using support::destroyDir;
+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;
namespace fs = boost::filesystem;
using std::endl;
#endif
-/// convenient to have it here.
-boost::scoped_ptr<kb_keymap> toplevel_keymap;
-
-///
-lyx::frontend::Application * theApp;
-
-namespace lyx {
-
/// 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;
-}
namespace {
string cl_system_support;
string cl_user_support;
+std::string geometryArg;
-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::use_gui) {
- theApp->exit(status);
- // Restore original font resources after Application is destroyed.
- lyx::support::restoreFontResources();
- }
-
- exit(status);
-}
-
+LyX * singleton_ = 0;
void showFileError(string const & error)
{
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)));
+ "Please check your installation."), from_utf8(error)));
}
{
string const configure_command = package().configure_command();
- lyxerr << lyx::to_utf8(_("LyX: reconfiguring user directory")) << endl;
- lyx::support::Path p(package().user_support());
+ lyxerr << to_utf8(_("LyX: reconfiguring user directory")) << endl;
+ support::Path p(package().user_support());
Systemcall one;
one.startscript(Systemcall::Wait, configure_command);
- lyxerr << "LyX: " << lyx::to_utf8(_("Done!")) << endl;
+ lyxerr << "LyX: " << to_utf8(_("Done!")) << endl;
}
} // namespace anon
-boost::scoped_ptr<LyX> LyX::singleton_;
+/// The main application class private implementation.
+struct LyX::Singletons
+{
+ Singletons(): iconv(ucs4_codeset, "UTF-8")
+ {
+ }
+ /// our function handler
+ LyXFunc lyxfunc_;
+ ///
+ BufferList buffer_list_;
+ ///
+ boost::scoped_ptr<kb_keymap> toplevel_keymap_;
+ ///
+ boost::scoped_ptr<LyXServer> lyx_server_;
+ ///
+ boost::scoped_ptr<LyXServerSocket> lyx_socket_;
+ ///
+ boost::scoped_ptr<frontend::Application> application_;
+ /// lyx session, containing lastfiles, lastfilepos, and lastopened
+ boost::scoped_ptr<Session> session_;
+
+ ///
+ IconvProcessor iconv;
+};
-int LyX::exec(int & argc, char * argv[])
+///
+frontend::Application * theApp()
{
- 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.
- return singleton_->priv_exec(argc, argv);
+ if (singleton_)
+ return &singleton_->application();
+ else
+ return 0;
}
-LyX & LyX::ref()
+LyX::~LyX()
{
- BOOST_ASSERT(singleton_.get());
- return *singleton_.get();
}
-LyX const & LyX::cref()
+LyX & LyX::ref()
{
- BOOST_ASSERT(singleton_.get());
- return *singleton_.get();
+ BOOST_ASSERT(singleton_);
+ return *singleton_;
}
-BufferList & theBufferList()
+LyX const & LyX::cref()
{
- return LyX::ref().bufferList();
+ BOOST_ASSERT(singleton_);
+ return *singleton_;
}
LyX::LyX()
- : first_start(false), geometryOption_(false)
+ : first_start(false)
{
- buffer_list_.reset(new BufferList);
+ singleton_ = this;
+ pimpl_.reset(new Singletons);
+ geometryArg.clear();
}
BufferList & LyX::bufferList()
{
- return *buffer_list_.get();
+ return pimpl_->buffer_list_;
}
BufferList const & LyX::bufferList() const
{
- return *buffer_list_.get();
+ return pimpl_->buffer_list_;
+}
+
+
+Session & LyX::session()
+{
+ BOOST_ASSERT(pimpl_->session_.get());
+ return *pimpl_->session_.get();
+}
+
+
+Session const & LyX::session() const
+{
+ BOOST_ASSERT(pimpl_->session_.get());
+ return *pimpl_->session_.get();
+}
+
+
+LyXFunc & LyX::lyxFunc()
+{
+ return pimpl_->lyxfunc_;
}
-lyx::Session & LyX::session()
+LyXFunc const & LyX::lyxFunc() const
{
- BOOST_ASSERT(session_.get());
- return *session_.get();
+ return pimpl_->lyxfunc_;
}
-lyx::Session const & LyX::session() const
+LyXServer & LyX::server()
{
- BOOST_ASSERT(session_.get());
- return *session_.get();
+ BOOST_ASSERT(pimpl_->lyx_server_.get());
+ return *pimpl_->lyx_server_.get();
}
-void LyX::addLyXView(LyXView * lyxview)
+LyXServer const & LyX::server() const
{
- views_.push_back(lyxview);
+ BOOST_ASSERT(pimpl_->lyx_server_.get());
+ return *pimpl_->lyx_server_.get();
+}
+
+
+LyXServerSocket & LyX::socket()
+{
+ BOOST_ASSERT(pimpl_->lyx_socket_.get());
+ return *pimpl_->lyx_socket_.get();
+}
+
+
+LyXServerSocket const & LyX::socket() const
+{
+ BOOST_ASSERT(pimpl_->lyx_socket_.get());
+ return *pimpl_->lyx_socket_.get();
+}
+
+
+frontend::Application & LyX::application()
+{
+ BOOST_ASSERT(pimpl_->application_.get());
+ return *pimpl_->application_.get();
+}
+
+
+frontend::Application const & LyX::application() const
+{
+ BOOST_ASSERT(pimpl_->application_.get());
+ return *pimpl_->application_.get();
+}
+
+
+kb_keymap & LyX::topLevelKeymap()
+{
+ BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
+ return *pimpl_->toplevel_keymap_.get();
+}
+
+
+IconvProcessor & LyX::iconvProcessor()
+{
+ return pimpl_->iconv;
+}
+
+
+kb_keymap const & LyX::topLevelKeymap() const
+{
+ BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
+ return *pimpl_->toplevel_keymap_.get();
}
return 0;
Buffer const * buffer_ptr = 0;
- ViewList::const_iterator it = views_.begin();
- ViewList::const_iterator const end = views_.end();
+ vector<int> const & view_ids = pimpl_->application_->gui().viewIds();
+ vector<int>::const_iterator it = view_ids.begin();
+ vector<int>::const_iterator const end = view_ids.end();
for (; it != end; ++it) {
- Buffer const * ptr = (*it)->updateInset(inset);
+ Buffer const * ptr =
+ pimpl_->application_->gui().view(*it).updateInset(inset);
if (ptr)
buffer_ptr = ptr;
}
}
-int LyX::priv_exec(int & argc, char * argv[])
+int LyX::exec(int & argc, char * argv[])
{
// Here we need to parse the command line. At least
// we need to parse for "-dbg" and "-help"
easyParse(argc, argv);
- lyx::support::init_package(argv[0], cl_system_support, cl_user_support,
- lyx::support::top_build_dir_is_one_level_up);
+ support::init_package(argv[0], cl_system_support, cl_user_support,
+ support::top_build_dir_is_one_level_up);
+
+ vector<FileName> files;
+
+ if (!use_gui) {
+ // FIXME: create a ConsoleApplication
+ int exit_status = loadFiles(argc, argv, files);
+ if (exit_status) {
+ prepareExit();
+ return exit_status;
+ }
+
+ if (batch_command.empty() || pimpl_->buffer_list_.empty()) {
+ prepareExit();
+ return EXIT_SUCCESS;
+ }
+
+ BufferList::iterator begin = pimpl_->buffer_list_.begin();
+ BufferList::iterator end = pimpl_->buffer_list_.end();
+
+ bool final_success = false;
+ for (BufferList::iterator I = begin; I != end; ++I) {
+ Buffer * buf = *I;
+ bool success = false;
+ buf->dispatch(batch_command, &success);
+ final_success |= success;
+ }
+ prepareExit();
+ return !final_success;
+ }
+ // Force adding of font path _before_ Application is initialized
+ support::addFontResources();
+
+ // 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 = loadFiles(argc, argv, files);
+ if (exit_status) {
+ // Kill the application object before exiting.
+ pimpl_->application_.reset();
+ use_gui = false;
+ prepareExit();
+ return exit_status;
+ }
+
+ restoreGuiSession(files);
// Start the real execution loop.
- if (lyx::use_gui) {
- // Force adding of font path _before_ Application is initialized
- lyx::support::addFontResources();
- application_.reset(lyx::createApplication(argc, argv));
- theApp = application_.get();
+
+ // FIXME
+ /* Create a CoreApplication class that will provide the main event loop
+ * and the socket callback registering. With Qt4, only QtCore
+ * library would be needed.
+ * When this is done, a server_mode could be created and the following two
+ * line would be moved out from here.
+ */
+ pimpl_->lyx_server_.reset(new LyXServer(&pimpl_->lyxfunc_, lyxrc.lyxpipes));
+ pimpl_->lyx_socket_.reset(new LyXServerSocket(&pimpl_->lyxfunc_,
+ support::os::internal_path(package().temp_dir() + "/lyxsocket")));
+
+ exit_status = pimpl_->application_->exec();
+
+ prepareExit();
+
+ // Restore original font resources after Application is destroyed.
+ support::restoreFontResources();
+
+ return exit_status;
+}
+
+
+void LyX::prepareExit()
+{
+ // Set a flag that we do quitting from the program,
+ // so no refreshes are necessary.
+ quitting = true;
+
+ // close buffers first
+ pimpl_->buffer_list_.closeAll();
+
+ // do any other cleanup procedures now
+ lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
+
+ // Prevent the deletion of /tmp if LyX was called with invalid
+ // arguments. Does not work on windows.
+ // FIXME: Fix the real bug instead.
+ if (package().temp_dir() == "/tmp") {
+ lyxerr << "Not deleting /tmp." << endl;
+ return;
}
- else {
- // FIXME: create a ConsoleApplication
- theApp = 0;
+
+ if (!destroyDir(package().temp_dir())) {
+ docstring const msg =
+ bformat(_("Unable to remove the temporary directory %1$s"),
+ from_utf8(package().temp_dir()));
+ Alert::warning(_("Unable to remove temporary directory"), msg);
+ }
+
+ if (use_gui) {
+ if (pimpl_->session_)
+ pimpl_->session_->writeFile();
+ pimpl_->session_.reset();
+ pimpl_->lyx_server_.reset();
+ pimpl_->lyx_socket_.reset();
}
- return exec2(argc, argv);
+ // Kill the application object before exiting. This avoids crashes
+ // when exiting on Linux.
+ if (pimpl_->application_)
+ pimpl_->application_.reset();
}
-int LyX::exec2(int & argc, char * argv[])
+void LyX::earlyExit(int status)
+{
+ BOOST_ASSERT(pimpl_->application_.get());
+ // LyX::pimpl_::application_ is not initialised at this
+ // point so it's safe to just exit after some cleanup.
+ prepareExit();
+ exit(status);
+}
+
+
+int LyX::loadFiles(int & argc, char * argv[],
+ vector<FileName> & files)
{
// check for any spurious extra arguments
// other than documents
for (int argi = 1; argi < argc ; ++argi) {
if (argv[argi][0] == '-') {
- lyxerr << lyx::to_utf8(
+ lyxerr << to_utf8(
bformat(_("Wrong command line option `%1$s'. Exiting."),
- lyx::from_utf8(argv[argi]))) << endl;
+ from_utf8(argv[argi]))) << endl;
return EXIT_FAILURE;
}
}
// Initialization of LyX (reads lyxrc and more)
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
- bool const success = init();
+ bool success = init();
lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
if (!success)
return EXIT_FAILURE;
- vector<string> files;
-
- for (int argi = argc - 1; argi >= 1; --argi)
- files.push_back(os::internal_path(argv[argi]));
+ for (int argi = argc - 1; argi >= 1; --argi) {
+ // check for any remaining extra arguments other than
+ // document file names. These will be passed out to the
+ // frontend.
+ if (argv[argi][0] == '-')
+ continue;
+ // get absolute path of file and add ".lyx" to
+ // the filename if necessary
+ files.push_back(fileSearch(string(), os::internal_path(argv[argi]), "lyx"));
+ }
if (first_start)
files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
- // Execute batch commands if available
- if (!batch_command.empty()) {
-
- lyxerr[Debug::INIT] << "About to handle -x '"
- << batch_command << '\'' << endl;
-
- Buffer * last_loaded = 0;
-
- vector<string>::const_iterator it = files.begin();
- vector<string>::const_iterator end = files.end();
-
- for (; it != end; ++it) {
- // get absolute path of file and add ".lyx" to
- // the filename if necessary
- string s = fileSearch(string(), *it, "lyx");
- if (s.empty()) {
- Buffer * const b = newFile(*it, string(), true);
- if (b)
- last_loaded = b;
- } else {
- Buffer * buf = theBufferList().newBuffer(s, false);
- 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
- theBufferList().release(buf);
- }
- }
+ Buffer * last_loaded = 0;
- // try to dispatch to last loaded buffer first
- if (last_loaded) {
- bool success = false;
- if (last_loaded->dispatch(batch_command, &success)) {
- quitLyX(false);
- return !success;
+ vector<FileName>::const_iterator it = files.begin();
+ vector<FileName>::const_iterator end = files.end();
+
+ for (; it != end; ++it) {
+ if (it->empty()) {
+ Buffer * const b = newFile(it->absFilename(), string(), true);
+ if (b)
+ last_loaded = b;
+ } else {
+ Buffer * buf = pimpl_->buffer_list_.newBuffer(it->absFilename(), false);
+ if (loadLyXFile(buf, *it)) {
+ 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
+ pimpl_->buffer_list_.release(buf);
}
- files.clear(); // the files are already loaded
}
- if (lyx::use_gui) {
- // determine windows size and position, from lyxrc and/or session
- // initial geometry
- unsigned int width = 690;
- unsigned int height = 510;
- bool maximize = false;
- // 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().loadSessionInfo("WindowWidth");
- if (!val.empty())
- width = convert<unsigned int>(val);
- val = session().loadSessionInfo("WindowHeight");
- if (!val.empty())
- height = convert<unsigned int>(val);
- if (session().loadSessionInfo("WindowIsMaximized") == "yes")
- maximize = true;
- }
- // if user wants to restore window position
- int posx = -1;
- int posy = -1;
- if (lyxrc.geometry_xysaved) {
- string val = session().loadSessionInfo("WindowPosX");
- if (!val.empty())
- posx = convert<int>(val);
- val = session().loadSessionInfo("WindowPosY");
- if (!val.empty())
- posy = convert<int>(val);
- }
+ files.clear(); // the files are already loaded
- if (geometryOption_) {
- width = 0;
- height = 0;
- }
- // create the main window
- LyXView * view = &application_->createView(width, height, posx, posy, maximize);
- ref().addLyXView(view);
-
- // 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 EXIT_SUCCESS;
+}
- return application_->start(batch_command);
- } else {
- // Something went wrong above
- quitLyX(false);
- return EXIT_FAILURE;
+
+void LyX::execBatchCommands()
+{
+ // Execute batch commands if available
+ if (batch_command.empty())
+ return;
+
+ lyxerr[Debug::INIT] << "About to handle -x '"
+ << batch_command << '\'' << endl;
+
+ pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command));
+}
+
+
+void LyX::restoreGuiSession(vector<FileName> const & files)
+{
+ LyXView * view = newLyXView();
+
+ // 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<FileName> const & lastopened = pimpl_->session_->lastOpened().getfiles();
+ // 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
+ pimpl_->session_->lastOpened().clear();
}
+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;
+ bool maximize = false;
+ // first try lyxrc
+ if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
+ width = lyxrc.geometry_width;
+ height = lyxrc.geometry_height;
+ }
+ // if lyxrc returns (0,0), then use session info
+ else {
+ string val = session().sessionInfo().load("WindowWidth");
+ if (!val.empty())
+ width = convert<unsigned int>(val);
+ val = session().sessionInfo().load("WindowHeight");
+ if (!val.empty())
+ height = convert<unsigned int>(val);
+ if (session().sessionInfo().load("WindowIsMaximized") == "yes")
+ maximize = true;
+ val = session().sessionInfo().load("IconSizeXY");
+ if (!val.empty())
+ iconSizeXY = convert<unsigned int>(val);
+ }
+
+ // if user wants to restore window position
+ int posx = -1;
+ int posy = -1;
+ if (lyxrc.geometry_xysaved) {
+ string val = session().sessionInfo().load("WindowPosX");
+ if (!val.empty())
+ posx = convert<int>(val);
+ val = session().sessionInfo().load("WindowPosY");
+ if (!val.empty())
+ posy = convert<int>(val);
+ }
+
+ if (!geometryArg.empty())
+ {
+ width = 0;
+ height = 0;
+ }
+
+ // create the main window
+ LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximize, iconSizeXY, geometryArg);
+
+ return view;
+}
+
/*
Signals and Windows
===================
#else
if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty())
#endif
- lyx::support::abort();
+ support::abort();
exit(0);
}
void LyX::printError(ErrorItem const & ei)
{
- docstring tmp = _("LyX: ") + ei.error + lyx::char_type(':')
+ docstring tmp = _("LyX: ") + ei.error + char_type(':')
+ ei.description;
- std::cerr << lyx::to_utf8(tmp) << std::endl;
+ std::cerr << to_utf8(tmp) << std::endl;
+}
+
+
+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();
}
"templates");
}
- if (lyxrc.roman_font_name.empty())
- lyxrc.roman_font_name =
- lyx::use_gui? application_->romanFontName(): "serif";
-
- if (lyxrc.sans_font_name.empty())
- lyxrc.sans_font_name =
- lyx::use_gui? application_->sansFontName(): "sans";
-
- if (lyxrc.typewriter_font_name.empty())
- lyxrc.typewriter_font_name =
- lyx::use_gui? application_->typewriterFontName(): "monospace";
-
//
// Read configuration files
//
reconfigureUserLyXDir();
// no need for a splash when there is no GUI
- if (!lyx::use_gui) {
+ if (!use_gui) {
first_start = false;
}
// Query the OS to know what formats are viewed natively
formats.setAutoOpen();
+ // Read lyxrc.dist again to be able to override viewer auto-detection.
+ readRcFile("lyxrc.dist");
+
system_lyxrc = lyxrc;
system_formats = formats;
system_converters = converters;
if (!LyXSetStyle())
return false;
- if (lyx::use_gui) {
+ if (use_gui) {
// Set up bindings
- toplevel_keymap.reset(new kb_keymap);
- defaultKeyBindings(toplevel_keymap.get());
- toplevel_keymap->read(lyxrc.bind_file);
+ pimpl_->toplevel_keymap_.reset(new kb_keymap);
+ defaultKeyBindings(pimpl_->toplevel_keymap_.get());
+ pimpl_->toplevel_keymap_->read(lyxrc.bind_file);
+
+ pimpl_->lyxfunc_.initKeySequences(pimpl_->toplevel_keymap_.get());
// Read menus
if (!readUIFile(lyxrc.ui_file))
fs::is_directory(lyxrc.document_path))
package().document_dir() = lyxrc.document_path;
- package().temp_dir() = createLyXTmpDir(lyxrc.tempdir_path);
+ package().temp_dir() = createLyXTmpDir(FileName(lyxrc.tempdir_path)).absFilename();
if (package().temp_dir().empty()) {
Alert::error(_("Could not create temporary directory"),
bformat(_("Could not create a temporary directory in\n"
"%1$s. Make sure that this\n"
"path exists and is writable and try again."),
- lyx::from_utf8(lyxrc.tempdir_path)));
+ from_utf8(lyxrc.tempdir_path)));
// 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
}
lyxerr[Debug::INIT] << "Reading session information '.lyx/session'..." << endl;
- session_.reset(new lyx::Session(lyxrc.num_lastfiles));
+ pimpl_->session_.reset(new Session(lyxrc.num_lastfiles));
+
+ // This must happen after package initialization and after lyxrc is
+ // read, therefore it can't be done by a static object.
+ ConverterCache::init();
+
return true;
}
// contain documents etc. which might be helpful on
// a crash
- theBufferList().emergencyWriteAll();
- application_->server().emergencyCleanup();
+ pimpl_->buffer_list_.emergencyWriteAll();
+ if (use_gui) {
+ if (pimpl_->lyx_server_)
+ pimpl_->lyx_server_->emergencyCleanup();
+ pimpl_->lyx_server_.reset();
+ pimpl_->lyx_socket_.reset();
+ }
}
bformat(_("You have specified a non-existent user "
"LyX directory, %1$s.\n"
"It is needed to keep your own configuration."),
- lyx::from_utf8(package().user_support())),
+ from_utf8(package().user_support())),
1, 0,
_("&Create directory"),
_("&Exit LyX"))) {
- lyxerr << lyx::to_utf8(_("No user LyX directory. Exiting.")) << endl;
- lyx_exit(EXIT_FAILURE);
+ lyxerr << to_utf8(_("No user LyX directory. Exiting.")) << endl;
+ earlyExit(EXIT_FAILURE);
}
- lyxerr << lyx::to_utf8(bformat(_("LyX: Creating directory %1$s"),
- lyx::from_utf8(package().user_support())))
+ lyxerr << to_utf8(bformat(_("LyX: Creating directory %1$s"),
+ from_utf8(package().user_support())))
<< endl;
if (!createDirectory(package().user_support(), 0755)) {
// Failed, so let's exit.
- lyxerr << lyx::to_utf8(_("Failed to create directory. Exiting."))
+ lyxerr << to_utf8(_("Failed to create directory. Exiting."))
<< endl;
- lyx_exit(EXIT_FAILURE);
+ earlyExit(EXIT_FAILURE);
}
return true;
{
lyxerr[Debug::INIT] << "About to read " << name << "... ";
- string const lyxrc_path = libFileSearch(string(), name);
+ FileName const lyxrc_path = libFileSearch(string(), name);
if (!lyxrc_path.empty()) {
lyxerr[Debug::INIT] << "Found in " << lyxrc_path << endl;
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string const ui_path = libFileSearch("ui", name, "ui");
+ FileName const ui_path = libFileSearch("ui", name, "ui");
if (ui_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string const lang_path = libFileSearch(string(), name);
+ FileName const lang_path = libFileSearch(string(), name);
if (lang_path.empty()) {
showFileError(name);
return false;
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string const enc_path = libFileSearch(string(), name);
+ FileName const enc_path = libFileSearch(string(), name);
if (enc_path.empty()) {
showFileError(name);
return false;
int parse_dbg(string const & arg, string const &)
{
if (arg.empty()) {
- lyxerr << lyx::to_utf8(_("List of supported debug flags:")) << endl;
+ lyxerr << to_utf8(_("List of supported debug flags:")) << endl;
Debug::showTags(lyxerr);
exit(0);
}
- lyxerr << lyx::to_utf8(bformat(_("Setting debug level to %1$s"), lyx::from_utf8(arg))) << endl;
+ lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
lyxerr.level(Debug::value(arg));
Debug::showLevel(lyxerr, lyxerr.level());
int parse_help(string const &, string const &)
{
lyxerr <<
- lyx::to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
+ to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
"Command line switches (case sensitive):\n"
"\t-help summarize LyX usage\n"
"\t-userdir dir set user directory to dir\n"
int parse_sysdir(string const & arg, string const &)
{
if (arg.empty()) {
- lyxerr << lyx::to_utf8(_("Missing directory for -sysdir switch")) << endl;
+ lyxerr << to_utf8(_("Missing directory for -sysdir switch")) << endl;
exit(1);
}
cl_system_support = arg;
int parse_userdir(string const & arg, string const &)
{
if (arg.empty()) {
- lyxerr << lyx::to_utf8(_("Missing directory for -userdir switch")) << endl;
+ lyxerr << to_utf8(_("Missing directory for -userdir switch")) << endl;
exit(1);
}
cl_user_support = arg;
int parse_execute(string const & arg, string const &)
{
if (arg.empty()) {
- lyxerr << lyx::to_utf8(_("Missing command string after --execute switch")) << endl;
+ lyxerr << to_utf8(_("Missing command string after --execute switch")) << endl;
exit(1);
}
batch = arg;
int parse_export(string const & type, string const &)
{
if (type.empty()) {
- lyxerr << lyx::to_utf8(_("Missing file type [eg latex, ps...] after "
+ lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after "
"--export switch")) << endl;
exit(1);
}
batch = "buffer-export " + type;
- lyx::use_gui = true;
+ use_gui = false;
return 1;
}
int parse_import(string const & type, string const & file)
{
if (type.empty()) {
- lyxerr << lyx::to_utf8(_("Missing file type [eg latex, ps...] after "
+ lyxerr << to_utf8(_("Missing file type [eg latex, ps...] after "
"--import switch")) << endl;
exit(1);
}
if (file.empty()) {
- lyxerr << lyx::to_utf8(_("Missing filename for --import")) << endl;
+ lyxerr << to_utf8(_("Missing filename for --import")) << endl;
exit(1);
}
return 2;
}
+int parse_geometry(string const & arg1, string const &)
+{
+ geometryArg = arg1;
+#if defined(_WIN32) || (defined(__CYGWIN__) && defined(X_DISPLAY_MISSING))
+ // remove also the arg
+ return 1;
+#else
+ // don't remove "-geometry"
+ return -1;
+#endif
+}
+
+
} // namespace anon
cmdmap["--export"] = parse_export;
cmdmap["-i"] = parse_import;
cmdmap["--import"] = parse_import;
+ cmdmap["-geometry"] = parse_geometry;
for (int i = 1; i < argc; ++i) {
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;
// 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;
+ if (remove > 0) {
+ argc -= remove;
+ for (int j = i; j < argc; ++j)
+ argv[j] = argv[j + remove];
+ --i;
+ }
}
batch_command = batch;
}
+
+
+FuncStatus getStatus(FuncRequest const & action)
+{
+ return LyX::ref().lyxFunc().getStatus(action);
+}
+
+
+void dispatch(FuncRequest const & action)
+{
+ LyX::ref().lyxFunc().dispatch(action);
+}
+
+
+BufferList & theBufferList()
+{
+ return LyX::ref().bufferList();
+}
+
+
+LyXFunc & theLyXFunc()
+{
+ return LyX::ref().lyxFunc();
+}
+
+
+LyXServer & theLyXServer()
+{
+ // FIXME: this should not be use_gui dependent
+ BOOST_ASSERT(use_gui);
+ return LyX::ref().server();
+}
+
+
+LyXServerSocket & theLyXServerSocket()
+{
+ // FIXME: this should not be use_gui dependent
+ BOOST_ASSERT(use_gui);
+ return LyX::ref().socket();
+}
+
+
+kb_keymap & theTopLevelKeymap()
+{
+ BOOST_ASSERT(use_gui);
+ return LyX::ref().topLevelKeymap();
+}
+
+
+IconvProcessor & utf8ToUcs4()
+{
+ return LyX::ref().iconvProcessor();
+}
+
+} // namespace lyx
projects / lyx.git / blobdiff