#include "LyX.h"
-#include "buffer_funcs.h"
+#include "LayoutFile.h"
#include "Buffer.h"
#include "BufferList.h"
#include "CmdDef.h"
#include "Encoding.h"
#include "ErrorList.h"
#include "Format.h"
+#include "FuncStatus.h"
#include "KeyMap.h"
#include "Language.h"
#include "Lexer.h"
#include "LyXAction.h"
#include "LyXFunc.h"
#include "LyXRC.h"
-#include "MenuBackend.h"
#include "ModuleList.h"
#include "Mover.h"
#include "Server.h"
#include "ServerSocket.h"
#include "Session.h"
-#include "TextClassList.h"
#include "ToolbarBackend.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
+#include "support/lassert.h"
#include "support/debug.h"
#include "support/environment.h"
#include "support/ExceptionMessage.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
#include <iostream>
#include <csignal>
#include <map>
+#include <stdlib.h>
#include <string>
#include <vector>
bool use_gui = true;
-bool quitting; // flag, that we are quitting the program
-
namespace {
// Filled with the command line arguments "foo" of "-sysdir foo" or
boost::scoped_ptr<Session> session_;
/// Files to load at start.
- vector<FileName> files_to_load_;
+ vector<string> files_to_load_;
/// The messages translators.
map<string, Messages> messages_;
delete pimpl_;
}
-#include <stdlib.h>
void LyX::exit(int exit_code) const
{
LyX & LyX::ref()
{
- BOOST_ASSERT(singleton_);
+ LASSERT(singleton_, /**/);
return *singleton_;
}
LyX const & LyX::cref()
{
- BOOST_ASSERT(singleton_);
+ LASSERT(singleton_, /**/);
return *singleton_;
}
Session & LyX::session()
{
- BOOST_ASSERT(pimpl_->session_.get());
+ LASSERT(pimpl_->session_.get(), /**/);
return *pimpl_->session_.get();
}
Session const & LyX::session() const
{
- BOOST_ASSERT(pimpl_->session_.get());
+ LASSERT(pimpl_->session_.get(), /**/);
return *pimpl_->session_.get();
}
Server & LyX::server()
{
- BOOST_ASSERT(pimpl_->lyx_server_.get());
+ LASSERT(pimpl_->lyx_server_.get(), /**/);
return *pimpl_->lyx_server_.get();
}
Server const & LyX::server() const
{
- BOOST_ASSERT(pimpl_->lyx_server_.get());
+ LASSERT(pimpl_->lyx_server_.get(), /**/);
return *pimpl_->lyx_server_.get();
}
ServerSocket & LyX::socket()
{
- BOOST_ASSERT(pimpl_->lyx_socket_.get());
+ LASSERT(pimpl_->lyx_socket_.get(), /**/);
return *pimpl_->lyx_socket_.get();
}
ServerSocket const & LyX::socket() const
{
- BOOST_ASSERT(pimpl_->lyx_socket_.get());
+ LASSERT(pimpl_->lyx_socket_.get(), /**/);
return *pimpl_->lyx_socket_.get();
}
frontend::Application & LyX::application()
{
- BOOST_ASSERT(pimpl_->application_.get());
+ LASSERT(pimpl_->application_.get(), /**/);
return *pimpl_->application_.get();
}
frontend::Application const & LyX::application() const
{
- BOOST_ASSERT(pimpl_->application_.get());
+ LASSERT(pimpl_->application_.get(), /**/);
return *pimpl_->application_.get();
}
-KeyMap & LyX::topLevelKeymap()
-{
- return pimpl_->toplevel_keymap_;
-}
-
-
CmdDef & LyX::topLevelCmdDef()
{
return pimpl_->toplevel_cmddef_;
}
-KeyMap const & LyX::topLevelKeymap() const
-{
- return pimpl_->toplevel_keymap_;
-}
-
-
Messages & LyX::getMessages(string const & language)
{
map<string, Messages>::iterator it = pimpl_->messages_.find(language);
pair<map<string, Messages>::iterator, bool> result =
pimpl_->messages_.insert(make_pair(language, Messages(language)));
- BOOST_ASSERT(result.second);
+ LASSERT(result.second, /**/);
return result.first->second;
}
cap::clearCutStack();
cap::clearSelection();
- // Set a flag that we do quitting from the program,
- // so no refreshes are necessary.
- quitting = true;
-
// close buffers first
pimpl_->buffer_list_.closeAll();
void LyX::earlyExit(int status)
{
- BOOST_ASSERT(pimpl_->application_.get());
+ LASSERT(pimpl_->application_.get(), /**/);
// LyX::pimpl_::application_ is not initialised at this
// point so it's safe to just exit after some cleanup.
prepareExit();
if (!success)
return EXIT_FAILURE;
- for (int argi = argc - 1; argi >= 1; --argi) {
- // get absolute path of file and add ".lyx" to
- // the filename if necessary
- pimpl_->files_to_load_.push_back(fileSearch(string(),
- os::internal_path(to_utf8(from_local8bit(argv[argi]))),
- "lyx", allow_unreadable));
- }
+ // Remaining arguments are assumed to be files to load.
+ for (int argi = argc - 1; argi >= 1; --argi)
+ pimpl_->files_to_load_.push_back(to_utf8(from_local8bit(argv[argi])));
- if (first_start)
- pimpl_->files_to_load_.push_back(i18nLibFileSearch("examples", "splash.lyx"));
+ if (first_start) {
+ pimpl_->files_to_load_.push_back(
+ i18nLibFileSearch("examples", "splash.lyx").absFilename());
+ }
return EXIT_SUCCESS;
}
-void LyX::addFileToLoad(FileName const & fname)
+void LyX::addFileToLoad(string const & fname)
{
- vector<FileName>::const_iterator cit = find(
+ vector<string>::const_iterator cit = find(
pimpl_->files_to_load_.begin(), pimpl_->files_to_load_.end(),
fname);
void LyX::loadFiles()
{
- vector<FileName>::const_iterator it = pimpl_->files_to_load_.begin();
- vector<FileName>::const_iterator end = pimpl_->files_to_load_.end();
+ vector<string>::const_iterator it = pimpl_->files_to_load_.begin();
+ vector<string>::const_iterator end = pimpl_->files_to_load_.end();
for (; it != end; ++it) {
- if (it->empty())
+ // get absolute path of file and add ".lyx" to
+ // the filename if necessary
+ FileName fname = fileSearch(string(), os::internal_path(*it), "lyx",
+ may_not_exist);
+
+ if (fname.empty())
continue;
- Buffer * buf = pimpl_->buffer_list_.newBuffer(it->absFilename(), false);
- if (buf->loadLyXFile(*it)) {
+ Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFilename(), false);
+ if (buf->loadLyXFile(fname)) {
ErrorList const & el = buf->errorList("Parse");
if (!el.empty())
for_each(el.begin(), el.end(),
// The advantage of doing this here is that the event loop
// is already started. So any need for interaction will be
// aknowledged.
- restoreGuiSession();
// if reconfiguration is needed.
- if (textclasslist.empty()) {
+ while (LayoutFileList::get().empty()) {
switch (Alert::prompt(
_("No textclass is found"),
_("LyX cannot continue because no textclass is found. "
pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_RECONFIGURE,
" --without-latex-config"));
break;
+ default:
+ pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT));
+ return;
}
- pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_LYX_QUIT));
- return;
}
- // Execute batch commands if available
- if (pimpl_->batch_command.empty())
- return;
-
- LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\'');
-
- pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
-}
-
-
-void LyX::restoreGuiSession()
-{
- // create the main window
+ // create the first main window
pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg));
- // if there is no valid class list, do not load any file.
- if (textclasslist.empty())
- return;
-
- // if some files were specified at command-line we assume that the
- // user wants to edit *these* files and not to restore the session.
if (!pimpl_->files_to_load_.empty()) {
- for_each(pimpl_->files_to_load_.begin(),
- pimpl_->files_to_load_.end(),
- bind(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, true));
+ // if some files were specified at command-line we assume that the
+ // user wants to edit *these* files and not to restore the session.
+ for (size_t i = 0; i != pimpl_->files_to_load_.size(); ++i) {
+ pimpl_->lyxfunc_.dispatch(
+ FuncRequest(LFUN_FILE_OPEN, pimpl_->files_to_load_[i]));
+ }
// clear this list to save a few bytes of RAM
pimpl_->files_to_load_.clear();
- pimpl_->session_->lastOpened().clear();
+ }
+ else
+ pimpl_->application_->restoreGuiSession();
- } else if (lyxrc.load_session) {
- vector<FileName> const & lastopened = pimpl_->session_->lastOpened().getfiles();
- // do not add to the lastfile list since these files are restored from
- // last session, and should be already there (regular files), or should
- // not be added at all (help files).
- for_each(lastopened.begin(), lastopened.end(),
- bind(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, false));
+ // Execute batch commands if available
+ if (pimpl_->batch_command.empty())
+ return;
- // clear this list to save a few bytes of RAM
- pimpl_->session_->lastOpened().clear();
- }
+ LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\'');
- BufferList::iterator I = pimpl_->buffer_list_.begin();
- BufferList::iterator end = pimpl_->buffer_list_.end();
- for (; I != end; ++I) {
- Buffer * buf = *I;
- if (buf != buf->masterBuffer())
- continue;
- updateLabels(*buf);
- }
+ pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
}
+
/*
Signals and Windows
===================
pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
// Read menus
- if (!readUIFile(lyxrc.ui_file))
+ if (use_gui && !readUIFile(lyxrc.ui_file))
return false;
if (lyxerr.debugging(Debug::LYXRC))
// This must happen after package initialization and after lyxrc is
// read, therefore it can't be done by a static object.
ConverterCache::init();
-
+
+ // init the global menubar on Mac. This must be done after the session
+ // was recovered to know the "last files".
+ if (use_gui)
+ theApp()->initGlobalMenu();
+
return true;
}
}
-void LyX::deadKeyBindings(KeyMap * kbmap)
-{
- // bindKeyings for transparent handling of deadkeys
- // The keysyms are gotten from XFree86 X11R6
- 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));
- // nothing with this name
- // 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));
- // nothing with this name either...
- //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));
-}
-
-
// return true if file does not exist or is older than configure.py.
static bool needsUpdate(string const & file)
{
// Read the ui file `name'
bool LyX::readUIFile(string const & name, bool include)
{
- enum Uitags {
+ enum {
ui_menuset = 1,
ui_toolbars,
ui_toolbarset,
ui_last
};
- struct keyword_item uitags[ui_last - 1] = {
+ LexerKeyword uitags[] = {
{ "include", ui_include },
{ "menuset", ui_menuset },
{ "toolbars", ui_toolbars },
uifiles.push_back(name);
LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
- Lexer lex(uitags, ui_last - 1);
+ Lexer lex(uitags);
lex.setFile(ui_path);
if (!lex.isOK()) {
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
break;
}
case ui_menuset:
- menubackend.read(lex);
+ theApp()->readMenus(lex);
break;
case ui_toolbarset:
Server & theServer()
{
// FIXME: this should not be use_gui dependent
- BOOST_ASSERT(use_gui);
+ LASSERT(use_gui, /**/);
return LyX::ref().server();
}
ServerSocket & theServerSocket()
{
// FIXME: this should not be use_gui dependent
- BOOST_ASSERT(use_gui);
+ LASSERT(use_gui, /**/);
return LyX::ref().socket();
}
KeyMap & theTopLevelKeymap()
{
- return LyX::ref().topLevelKeymap();
+ return LyX::ref().pimpl_->toplevel_keymap_;
}