This commit saves the need to check for lyx::use_gui in a number of places.

[lyx.git] / src / frontends / Application.C

diff --git a/src/frontends/Application.C b/src/frontends/Application.C
index 87d40fa60a98bce781c6eb549b390fb776bd74bc..741099670b38a284884e315cceacbc43f05cd395 100644 (file)
--- a/src/frontends/Application.C
+++ b/src/frontends/Application.C
@@ -10,27 +10,51 @@
 
 #include <config.h>
 
-#include "Application.h"
-
-#include "Application_pimpl.h"
-#include "Gui.h"
-#include "LyXView.h"
-#include "WorkArea.h"
-
+#include "frontends/Application.h"
+
+#include "frontends/NoGuiFontLoader.h"
+#include "frontends/NoGuiFontMetrics.h"
+#include "frontends/FontLoader.h"
+#include "frontends/FontMetrics.h"
+#include "frontends/Gui.h"
+#include "frontends/LyXView.h"
+#include "frontends/WorkArea.h"
+
+#include "bufferlist.h"
+#include "funcrequest.h"
+#include "FuncStatus.h"
+#include "lyx_main.h"
 #include "LyXAction.h"
+#include "lyxfont.h"
 #include "lyxfunc.h"
 #include "lyxrc.h"
+#include "lyxserver.h"
+#include "lyxsocket.h"
 
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/package.h"
 
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 
 using lyx::support::package;
 
 namespace lyx {
 namespace frontend {
 
+/// The main application class private implementation.
+struct Application_pimpl 
+{
+       /// our function handler
+       boost::scoped_ptr<LyXFunc> lyxfunc_;
+       ///
+       boost::scoped_ptr<LyXServer> lyx_server_;
+       ///
+       boost::scoped_ptr<LyXServerSocket> lyx_socket_;
+};
+
+
 Application::Application(int &, char **)
 {
        pimpl_ = new Application_pimpl;
@@ -73,25 +97,12 @@ LyXServerSocket const & Application::socket() const
 }
 
 
-BufferList & Application::bufferList()
-{
-       return pimpl_->buffer_list_;
-}
-
-
-BufferList const & Application::bufferList() const
-{
-       return pimpl_->buffer_list_;
-}
-
-
 void Application::setBufferView(BufferView * buffer_view)
 {
        buffer_view_ = buffer_view;
 }
 
 
-// FIXME: this whole method needs to be moved to Application.
 LyXView & Application::createView(unsigned int width,
                                                                  unsigned int height,
                                                                  int posx, int posy,
@@ -103,7 +114,7 @@ LyXView & Application::createView(unsigned int width,
        // this can't be done before because it needs the Languages object
        //initEncodings();
 
-       int view_id = gui().newView(width, height);
+       int view_id = gui().newView();
        LyXView & view = gui().view(view_id);
 
        pimpl_->lyxfunc_.reset(new LyXFunc(&view));
@@ -133,6 +144,64 @@ int Application::start(std::string const & batch)
        return exec();
 }
 
-
 } // namespace frontend
+
+
+FuncStatus getStatus(FuncRequest const & action)
+{
+       return theApp->lyxFunc().getStatus(action);
+}
+
+
+void dispatch(FuncRequest const & action)
+{
+       theApp->lyxFunc().dispatch(action);
+}
+
 } // namespace lyx
+
+
+LyXFunc & theLyXFunc()
+{
+       BOOST_ASSERT(theApp);
+       return theApp->lyxFunc();
+}
+
+
+lyx::frontend::FontLoader & theFontLoader()
+{
+       static lyx::frontend::NoGuiFontLoader no_gui_font_loader;
+
+       if (!lyx::use_gui)
+               return no_gui_font_loader;
+
+       BOOST_ASSERT(theApp);
+       return theApp->fontLoader();
+}
+
+
+lyx::frontend::FontMetrics const & theFontMetrics(LyXFont const & f)
+{
+       static lyx::frontend::NoGuiFontMetrics no_gui_font_metrics;
+
+       if (!lyx::use_gui)
+               return no_gui_font_metrics;
+
+       BOOST_ASSERT(theApp);
+       return theApp->fontLoader().metrics(f);
+}
+
+
+lyx::frontend::Clipboard & theClipboard()
+{
+       BOOST_ASSERT(theApp);
+       return theApp->clipboard();
+}
+
+
+lyx::frontend::Selection & theSelection()
+{
+       BOOST_ASSERT(theApp);
+       return theApp->selection();
+}
+