#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
#include "support/bind.h"
using namespace std;
using namespace lyx::support;
+#if defined (USE_MACOSX_PACKAGING)
+#include <crt_externs.h>
+#endif
+
namespace lyx {
namespace Alert = frontend::Alert;
} // namespace anon
/// The main application class private implementation.
-struct LyX::Impl
-{
- Impl() : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
- {
- }
+struct LyX::Impl {
+ Impl()
+ : latexfonts_(0), spell_checker_(0), apple_spell_checker_(0), aspell_checker_(0), enchant_checker_(0), hunspell_checker_(0)
+ {}
~Impl()
{
bool first_start;
/// the parsed command line batch command if any
vector<string> batch_commands;
-
+
///
LaTeXFonts * latexfonts_;
SpellChecker * hunspell_checker_;
};
+
///
frontend::Application * theApp()
{
pair<map<string, Messages>::iterator, bool> result =
pimpl_->messages_.insert(make_pair(language, Messages(language)));
- LASSERT(result.second, /**/);
+ LATTEST(result.second);
return result.first->second;
}
try {
init_package(os::utf8_argv(0), string(), string());
// we do not get to this point when init_package throws an exception
- locale_init();
+ setLocale();
} catch (ExceptionMessage const & message) {
LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_);
}
// Reinit the messages machinery in case package() knows
// something interesting about the locale directory.
- Messages::init();
+ setLocale();
if (!use_gui) {
// FIXME: create a ConsoleApplication
// Reestablish our defaults, as Qt overwrites them
// after createApplication()
- locale_init();
+ setLocale();//???
// Parse and remove all known arguments in the LyX singleton
// Give an error for all remaining ones.
// FIXME
/* Create a CoreApplication class that will provide the main event loop
- * and the socket callback registering. With Qt4, only QtCore
+ * and the socket callback registering. With Qt, 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.
void LyX::earlyExit(int status)
{
- LASSERT(pimpl_->application_.get(), /**/);
+ LATTEST(pimpl_->application_.get());
// LyX::pimpl_::application_ is not initialised at this
// point so it's safe to just exit after some cleanup.
prepareExit();
for (int argi = 1; argi < argc; ++argi)
pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
+ if (!use_gui && pimpl_->files_to_load_.empty()) {
+ lyxerr << to_utf8(_("Missing filename for this operation.")) << endl;
+ return EXIT_FAILURE;
+ }
+
if (first_start) {
pimpl_->files_to_load_.push_back(
i18nLibFileSearch("examples", "splash.lyx").absFileName());
bool LyX::loadFiles()
{
- LASSERT(!use_gui, /**/);
+ LATTEST(!use_gui);
bool success = true;
vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
vector<string>::const_iterator end = pimpl_->files_to_load_.end();
}
else {
pimpl_->buffer_list_.release(buf);
+ docstring const error_message =
+ bformat(_("LyX failed to load the following file: %1$s"),
+ from_utf8(fname.absFileName()));
+ lyxerr << to_utf8(error_message) << endl;
success = false;
}
}
void execBatchCommands()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
singleton_->execCommands();
}
if (!msg.empty()) {
lyxerr << "\nlyx: " << msg << endl;
// try to make a GUI message
- Alert::error(_("LyX crashed!"), msg);
+ Alert::error(_("LyX crashed!"), msg, true);
}
// Deinstall the signal handlers
cerr << to_utf8(tmp) << endl;
}
+#if defined (USE_MACOSX_PACKAGING)
+namespace {
+ // Unexposed--extract an environment variable name from its NAME=VALUE
+ // representation
+ std::string varname(const char* line)
+ {
+ size_t nameLen = strcspn(line, "=");
+ if (nameLen == strlen(line)) {
+ return std::string();
+ } else {
+ return std::string(line, nameLen);
+ }
+ }
+}
+
+void cleanDuplicateEnvVars()
+{
+ std::set<std::string> seen;
+ std::set<std::string> dupes;
+
+ // Create a list of the environment variables that appear more than once
+ for (char **read = *_NSGetEnviron(); *read; read++) {
+ std::string name = varname(*read);
+ if (name.size() == 0) {
+ continue;
+ }
+ if (seen.find(name) != seen.end()) {
+ dupes.insert(name);
+ } else {
+ seen.insert(name);
+ }
+ }
+
+ // Loop over the list of duplicated variables
+ for (std::set<std::string>::iterator dupe = dupes.begin(); dupe != dupes.end(); dupe++) {
+ const char *name = (*dupe).c_str();
+ char *val = getenv(name);
+ if (val != NULL) {
+ LYXERR(Debug::INIT, "Duplicate environment variable: " << name);
+ // unsetenv removes *all* instances of the variable from the environment
+ unsetenv(name);
+
+ // replace with the value from getenv (in practice appears to be the
+ // first value in the list)
+ setenv(name, val, 0);
+ }
+ }
+}
+#endif
bool LyX::init()
{
signal(SIGTERM, error_handler);
// SIGPIPE can be safely ignored.
+#if defined (USE_MACOSX_PACKAGING)
+ cleanDuplicateEnvVars();
+#endif
+
lyxrc.tempdir_path = package().temp_dir().absFileName();
lyxrc.document_path = package().document_dir().absFileName();
if (!setEnv("LyXDir", lyx_dir))
LYXERR(Debug::INIT, "\t... failed!");
+ if (package().explicit_user_support() && getEnv(LYX_USERDIR_VER).empty()) {
+ // -userdir was given on the command line.
+ // Make it available to child processes, otherwise tex2lyx
+ // would not find all layout files, and other converters might
+ // use it as well.
+ string const user_dir = package().user_support().absFileName();
+ LYXERR(Debug::INIT, "Setting " LYX_USERDIR_VER "... to \""
+ << user_dir << '"');
+ if (!setEnv(LYX_USERDIR_VER, user_dir))
+ LYXERR(Debug::INIT, "\t... failed!");
+ }
+
//
// Read configuration files
//
prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));
// Check that user LyX directory is ok.
- if (queryUserLyXDir(package().explicit_user_support()))
- reconfigureUserLyXDir();
+ {
+ string const lock_file = package().user_support().absFileName() + ".lyx_configure_lock";
+ int fd = fileLock(lock_file.c_str());
+
+ if (queryUserLyXDir(package().explicit_user_support())) {
+ reconfigureUserLyXDir();
+ }
+ fileUnlock(fd, lock_file.c_str());
+ }
if (!use_gui) {
// No need for a splash when there is no GUI
if (!readRcFile("preferences", true))
return false;
+ // The language may have been set to someting useful through prefs
+ setLocale();
+
if (!readEncodingsFile("encodings", "unicodesymbols"))
return false;
if (!readLanguagesFile("languages"))
lyxrc.print();
os::windows_style_tex_paths(lyxrc.windows_style_tex_paths);
+ // Prepend path prefix a second time to take the user preferences into a account
if (!lyxrc.path_prefix.empty())
prependEnvPath("PATH", replaceEnvironmentPath(lyxrc.path_prefix));
"\t-e [--export] fmt\n"
" where fmt is the export format of choice. Look in\n"
" Tools->Preferences->File Handling->File Formats->Short Name\n"
- " to get an idea which parameters should be passed.\n"
+ " to see which parameter (which differs from the format name\n"
+ " in the File->Export menu) should be passed.\n"
" Note that the order of -e and -x switches matters.\n"
"\t-E [--export-to] fmt filename\n"
" where fmt is the export format of choice (see --export),\n"
{
cout << "LyX " << lyx_version
<< " (" << lyx_release_date << ")" << endl;
- cout << "Built on " << __DATE__ << ", " << __TIME__ << endl;
-
+ if (string(lyx_git_commit_hash) != "none")
+ cout << to_utf8(_(" Git commit hash "))
+ << string(lyx_git_commit_hash).substr(0,8) << endl;
+ cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
+ from_ascii(lyx_build_date), from_ascii(lyx_build_time))) << endl;
cout << lyx_version_info << endl;
exit(0);
return 0;
lyxerr << to_utf8(_("Missing filename for --import")) << endl;
exit(1);
}
-
batch = "buffer-import " + type + ' ' + file;
return 2;
}
FuncStatus getStatus(FuncRequest const & action)
{
- LASSERT(theApp(), /**/);
+ LAPPERR(theApp());
return theApp()->getStatus(action);
}
void dispatch(FuncRequest const & action)
{
- LASSERT(theApp(), /**/);
+ LAPPERR(theApp());
return theApp()->dispatch(action);
}
void dispatch(FuncRequest const & action, DispatchResult & dr)
{
- LASSERT(theApp(), /**/);
+ LAPPERR(theApp());
return theApp()->dispatch(action, dr);
}
vector<string> & theFilesToLoad()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->files_to_load_;
}
BufferList & theBufferList()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->buffer_list_;
}
Server & theServer()
{
// FIXME: this should not be use_gui dependent
- LASSERT(use_gui, /**/);
- LASSERT(singleton_, /**/);
+ LWARNIF(use_gui);
+ LAPPERR(singleton_);
return *singleton_->pimpl_->lyx_server_.get();
}
ServerSocket & theServerSocket()
{
// FIXME: this should not be use_gui dependent
- LASSERT(use_gui, /**/);
- LASSERT(singleton_, /**/);
+ LWARNIF(use_gui);
+ LAPPERR(singleton_);
return *singleton_->pimpl_->lyx_socket_.get();
}
KeyMap & theTopLevelKeymap()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->toplevel_keymap_;
}
Converters & theConverters()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->converters_;
}
Converters & theSystemConverters()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->system_converters_;
}
Movers & theMovers()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->movers_;
}
Mover const & getMover(string const & fmt)
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->movers_(fmt);
}
void setMover(string const & fmt, string const & command)
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
singleton_->pimpl_->movers_.set(fmt, command);
}
Movers & theSystemMovers()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->system_movers_;
}
Messages const & getMessages(string const & language)
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->messages(language);
}
Messages const & getGuiMessages()
{
- LASSERT(singleton_, /**/);
- // A cache to translate full language name to language code
- static string last_language = "auto";
- static string code;
- if (lyxrc.gui_language != last_language) {
- if (lyxrc.gui_language == "auto")
- code.clear();
- else {
- Language const * l = languages.getLanguage(lyxrc.gui_language);
- code = l ? l->code() : string();
- }
- last_language = lyxrc.gui_language;
- }
- return singleton_->messages(code);
+ LAPPERR(singleton_);
+ return singleton_->messages(Messages::guiLanguage());
}
Session & theSession()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return *singleton_->pimpl_->session_.get();
}
LaTeXFonts & theLaTeXFonts()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
if (!singleton_->pimpl_->latexfonts_)
singleton_->pimpl_->latexfonts_ = new LaTeXFonts;
return *singleton_->pimpl_->latexfonts_;
CmdDef & theTopLevelCmdDef()
{
- LASSERT(singleton_, /**/);
+ LAPPERR(singleton_);
return singleton_->pimpl_->toplevel_cmddef_;
}
projects / lyx.git / blobdiff