#include "LyXFunc.h"
#include "Lexer.h"
#include "LyXRC.h"
-#include "LyXServer.h"
-#include "LyXServerSocket.h"
-#include "LyXTextClassList.h"
+#include "Server.h"
+#include "ServerSocket.h"
+#include "TextClassList.h"
#include "MenuBackend.h"
#include "Messages.h"
#include "Mover.h"
#include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
+#include <algorithm>
#include <iostream>
#include <csignal>
#include <map>
///
boost::scoped_ptr<KeyMap> toplevel_keymap_;
///
- boost::scoped_ptr<LyXServer> lyx_server_;
+ boost::scoped_ptr<Server> lyx_server_;
///
- boost::scoped_ptr<LyXServerSocket> lyx_socket_;
+ boost::scoped_ptr<ServerSocket> lyx_socket_;
///
boost::scoped_ptr<frontend::Application> application_;
/// lyx session, containing lastfiles, lastfilepos, and lastopened
}
-LyXServer & LyX::server()
+Server & LyX::server()
{
BOOST_ASSERT(pimpl_->lyx_server_.get());
return *pimpl_->lyx_server_.get();
}
-LyXServer const & LyX::server() const
+Server const & LyX::server() const
{
BOOST_ASSERT(pimpl_->lyx_server_.get());
return *pimpl_->lyx_server_.get();
}
-LyXServerSocket & LyX::socket()
+ServerSocket & LyX::socket()
{
BOOST_ASSERT(pimpl_->lyx_socket_.get());
return *pimpl_->lyx_socket_.get();
}
-LyXServerSocket const & LyX::socket() const
+ServerSocket const & LyX::socket() const
{
BOOST_ASSERT(pimpl_->lyx_socket_.get());
return *pimpl_->lyx_socket_.get();
}
-Buffer const * const LyX::updateInset(InsetBase const * inset) const
+Buffer const * const LyX::updateInset(Inset const * inset) const
{
if (!inset)
return 0;
*/
// Note: socket callback must be registered after init(argc, argv)
// such that package().temp_dir() is properly initialized.
- pimpl_->lyx_server_.reset(new LyXServer(&pimpl_->lyxfunc_, lyxrc.lyxpipes));
- pimpl_->lyx_socket_.reset(new LyXServerSocket(&pimpl_->lyxfunc_,
+ pimpl_->lyx_server_.reset(new Server(&pimpl_->lyxfunc_, lyxrc.lyxpipes));
+ pimpl_->lyx_socket_.reset(new ServerSocket(&pimpl_->lyxfunc_,
FileName(package().temp_dir().absFilename() + "/lyxsocket")));
// Start the real execution loop.
}
+void LyX::addFileToLoad(FileName const & fname)
+{
+ vector<FileName>::const_iterator cit = std::find(
+ pimpl_->files_to_load_.begin(), pimpl_->files_to_load_.end(),
+ fname);
+
+ if (cit == pimpl_->files_to_load_.end())
+ pimpl_->files_to_load_.push_back(fname);
+}
+
+
void LyX::loadFiles()
{
vector<FileName>::const_iterator it = pimpl_->files_to_load_.begin();
}
-LyXServer & theLyXServer()
+Server & theServer()
{
// FIXME: this should not be use_gui dependent
BOOST_ASSERT(use_gui);
}
-LyXServerSocket & theLyXServerSocket()
+ServerSocket & theServerSocket()
{
// FIXME: this should not be use_gui dependent
BOOST_ASSERT(use_gui);