#include "io_callback.h"
// FIXME: move this stuff out again
-#include "bufferlist.h"
#include "lyxfunc.h"
#include "lyxserver.h"
#include "lyxsocket.h"
#include "BufferView.h"
+#include "GuiApplication.h"
+#include "GuiImplementation.h"
#include "GView.h"
#include "GtkmmX.h"
-#include "xftFontLoader.h"
#include "GWorkArea.h"
#include "support/lyxlib.h"
#include <gtkmm.h>
-#include "LyXGdkImage.h"
-
#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
using lyx::support::package;
using lyx::frontend::colorCache;
+using lyx::frontend::Gui;
+using lyx::frontend::GuiApplication;
+using lyx::frontend::GuiImplementation;
using lyx::frontend::GView;
-extern BufferList bufferlist;
-
-// FIXME: wrong place !
-LyXServer * lyxserver;
-LyXServerSocket * lyxsocket;
-
bool lyx_gui::use_gui = true;
namespace {
} // namespace anon
+lyx::frontend::Application * theApp;
+GuiApplication * guiApp;
-void lyx_gui::parse_init(int & argc, char * argv[])
+int lyx_gui::exec(int & argc, char * argv[])
{
- new Gtk::Main(argc, argv);
-
- using namespace lyx::graphics;
- Image::newImage = boost::bind(&LyXGdkImage::newImage);
- Image::loadableFormats = boost::bind(&LyXGdkImage::loadableFormats);
+ guiApp = new GuiApplication(argc, argv);
+ theApp = guiApp;
- locale_init();
-
- // must do this /before/ lyxrc gets read
- lyxrc.dpi = getDPI();
+ return LyX::ref().exec2(argc, argv);
}
}
-void lyx_gui::start(string const & batch, std::vector<string> const & files)
+LyXView * lyx_gui::create_view(unsigned int width, unsigned int height,
+ int posx, int posy, bool maximize)
{
- boost::shared_ptr<GView> view_ptr(new GView);
- LyX::ref().addLyXView(view_ptr);
-
- GView & view = *view_ptr.get();
- view.show();
- view.init();
-
- // FIXME: server code below needs moving
-
- lyxserver = new LyXServer(&view.getLyXFunc(), lyxrc.lyxpipes);
- lyxsocket = new LyXServerSocket(&view.getLyXFunc(),
- os::internal_path(package().temp_dir() + "/lyxsocket"));
-
- for_each(files.begin(), files.end(),
- bind(&BufferView::loadLyXFile, view.view(), _1, true));
-
- // handle the batch commands the user asked for
- if (!batch.empty()) {
- view.getLyXFunc().dispatch(lyxaction.lookupFunc(batch));
- }
+ return &guiApp->createView(width, height, posx, posy, maximize);
+}
- Gtk::Main::run();
- // FIXME: breaks emergencyCleanup
- delete lyxsocket;
- delete lyxserver;
+int lyx_gui::start(LyXView *, string const & batch)
+{
+ return guiApp->start(batch);
}
-void lyx_gui::exit()
+void lyx_gui::exit(int status)
{
- Gtk::Main::quit();
+ guiApp->exit(status);
}
{
FuncStatus flag;
switch (ev.action) {
- case LFUN_DIALOG_SHOW:
- if (ev.argument == "preamble")
- flag.unknown(true);
- break;
- case LFUN_TOGGLE_TOOLTIPS:
+ case LFUN_TOOLTIPS_TOGGLE:
flag.unknown(true);
break;
default: