Extracted from r14281

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

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index a0376f3dea81d45db907c41dd61e49fd64c0ba93..7cf2a058872ab425c93c0f3bdce2a808864eaa4e 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -12,10 +12,12 @@
 #include <config.h>
 
 #include "LyXView.h"
+#include "Gui.h"
 #include "Dialogs.h"
 #include "Timeout.h"
-#include "Toolbar.h"
+#include "Toolbars.h"
 #include "Menubar.h"
+#include "WorkArea.h"
 
 #include "buffer.h"
 #include "bufferparams.h"
@@ -39,21 +41,37 @@
 
 #include <boost/bind.hpp>
 
-#include <sys/time.h>
-#include <unistd.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
+using lyx::frontend::Gui;
+using lyx::frontend::WorkArea;
+
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
 
 using std::endl;
 using std::string;
 
+using lyx::frontend::ControlCommandBuffer;
 
 string current_layout;
 
+Gui & LyXView::gui()
+{
+       return owner_;
+}
+
 
-LyXView::LyXView()
-       : intl_(new Intl),
+LyXView::LyXView(Gui & owner)
+       : work_area_(0),
+         owner_(owner),
+         toolbars_(new Toolbars(*this)),
+         intl_(new Intl),
          autosave_timeout_(new Timeout(5000)),
          lyxfunc_(new LyXFunc(this)),
          dialogs_(new Dialogs(*this)),
@@ -68,6 +86,18 @@ LyXView::~LyXView()
 }
 
 
+void LyXView::setWorkArea(WorkArea * work_area)
+{
+       work_area_ = work_area;
+}
+
+
+void LyXView::redrawWorkArea()
+{
+       work_area_->redraw();
+}
+
+
 void LyXView::init()
 {
        updateLayoutChoice();
@@ -80,34 +110,38 @@ void LyXView::init()
                autosave_timeout_->start();
        }
 
-       intl_->InitKeyMapper(lyxrc.use_kbmap);
+       intl_->initKeyMapper(lyxrc.use_kbmap);
 }
 
 
 Buffer * LyXView::buffer() const
 {
-       return bufferview_->buffer();
+       return work_area_->bufferView().buffer();
 }
 
 
-boost::shared_ptr<BufferView> const & LyXView::view() const
+BufferView * LyXView::view() const
 {
-       return bufferview_;
+       return &work_area_->bufferView();
 }
 
 
 void LyXView::setLayout(string const & layout)
 {
-       toolbar_->setLayout(layout);
+       toolbars_->setLayout(layout);
 }
 
 
-void LyXView::updateToolbar()
+void LyXView::updateToolbars()
 {
-       bool const math = bufferview_->cursor().inMathed();
+       bool const math = work_area_->bufferView().cursor().inMathed();
        bool const table =
-               !getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).disabled();
-       toolbar_->update(math, table);
+               getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
+       toolbars_->update(math, table);
+       // update redaonly status of open dialogs. This could also be in
+       // updateMenubar(), but since updateToolbars() and updateMenubar()
+       // are always called together it is only here.
+       getDialogs().checkStatus();
 }
 
 
@@ -122,7 +156,7 @@ void LyXView::autoSave()
        lyxerr[Debug::INFO] << "Running autoSave()" << endl;
 
        if (view()->available()) {
-               ::AutoSave(view().get());
+               ::autoSave(view());
        }
 }
 
@@ -136,22 +170,25 @@ void LyXView::resetAutosaveTimer()
 
 void LyXView::updateLayoutChoice()
 {
-       // don't show any layouts without a buffer
+       // Don't show any layouts without a buffer
        if (!view()->buffer()) {
-               toolbar_->clearLayoutList();
+               toolbars_->clearLayoutList();
                return;
        }
 
-       // update the layout display
-       if (toolbar_->updateLayoutList(buffer()->params().textclass)) {
+       // Update the layout display
+       if (toolbars_->updateLayoutList(buffer()->params().textclass)) {
                current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
        }
 
+       if (work_area_->bufferView().cursor().inMathed())
+               return;
+
        string const & layout =
-               bufferview_->getLyXText()->cursorPar()->layout()->name();
+               work_area_->bufferView().cursor().paragraph().layout()->name();
 
        if (layout != current_layout) {
-               toolbar_->setLayout(layout);
+               toolbars_->setLayout(layout);
                current_layout = layout;
        }
 }
@@ -166,8 +203,8 @@ void LyXView::updateWindowTitle()
        if (view()->available()) {
                string const cur_title = buffer()->fileName();
                if (!cur_title.empty()) {
-                       maximize_title += ": " + MakeDisplayPath(cur_title, 30);
-                       minimize_title = OnlyFilename(cur_title);
+                       maximize_title += ": " + makeDisplayPath(cur_title, 30);
+                       minimize_title = onlyFilename(cur_title);
                        if (!buffer()->isClean()) {
                                maximize_title += _(" (changed)");
                                minimize_title += '*';
@@ -190,12 +227,13 @@ void LyXView::dispatch(FuncRequest const & cmd)
 }
 
 
-Buffer const * const LyXView::updateInset(InsetOld const * inset) const
+Buffer const * const LyXView::updateInset(InsetBase const * inset) const
 {
        Buffer const * buffer_ptr = 0;
        if (inset) {
-               buffer_ptr = bufferview_->buffer();
-               bufferview_->update();
+               buffer_ptr = work_area_->bufferView().buffer();
+               // No FitCursor:
+               work_area_->bufferView().update(Update::Force);
        }
        return buffer_ptr;
 }