* remove various xforms relicts, in particular:

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index 30c0de050ee88349cd9182d6b0000aa4267c1d7e..f1c1834b1c24523ccbe437d3d69c161b1e5c78b2 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -37,17 +37,18 @@
 #include "texrow.h"
 #include "undo.h"
 #include "WordLangTuple.h"
+#include "metricsinfo.h"
 
 #include "frontends/Alert.h"
+#include "frontends/Clipboard.h"
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
-#include "frontends/screen.h"
-#include "frontends/WorkArea.h"
+#include "frontends/Gui.h"
 
 #include "insets/insetcommand.h" // ChangeRefs
-#include "insets/updatableinset.h"
 #include "insets/insettext.h"
 
+
 using lyx::support::bformat;
 
 using lyx::cap::setSelectionRange;
@@ -55,15 +56,14 @@ using lyx::cap::setSelectionRange;
 using std::distance;
 using std::find;
 using std::string;
-using std::swap;
 using std::vector;
 
 
 extern BufferList bufferlist;
 
 
-BufferView::BufferView(LyXView * owner, int width, int height)
-       : pimpl_(new Pimpl(*this, owner, width, height))
+BufferView::BufferView(LyXView * owner)
+       : pimpl_(new Pimpl(*this, owner))
 {}
 
 
@@ -85,24 +85,12 @@ Buffer * BufferView::buffer() const
 }
 
 
-LyXScreen & BufferView::screen() const
-{
-       return pimpl_->screen();
-}
-
-
 LyXView * BufferView::owner() const
 {
        return pimpl_->owner_;
 }
 
 
-Painter & BufferView::painter() const
-{
-       return pimpl_->painter();
-}
-
-
 void BufferView::setBuffer(Buffer * b)
 {
        pimpl_->setBuffer(b);
@@ -142,9 +130,9 @@ bool BufferView::fitCursor()
 }
 
 
-void BufferView::update(bool fitcursor, bool forceupdate)
+void BufferView::update(Update::flags flags)
 {
-       pimpl_->update(fitcursor, forceupdate);
+       pimpl_->update(flags);
 }
 
 
@@ -154,6 +142,12 @@ void BufferView::updateScrollbar()
 }
 
 
+ScrollbarParameters const & BufferView::scrollbarParameters() const
+{
+       return pimpl_->scrollbarParameters();
+}
+
+
 void BufferView::scrollDocView(int value)
 {
        pimpl_->scrollDocView(value);
@@ -189,6 +183,10 @@ bool BufferView::isSavedPosition(unsigned int i)
        return pimpl_->isSavedPosition(i);
 }
 
+void BufferView::saveSavedPositions()
+{
+       return pimpl_->saveSavedPositions();
+}
 
 void BufferView::switchKeyMap()
 {
@@ -198,7 +196,7 @@ void BufferView::switchKeyMap()
 
 int BufferView::workWidth() const
 {
-       return pimpl_->workarea().workWidth();
+       return pimpl_->width();
 }
 
 
@@ -208,27 +206,45 @@ void BufferView::center()
 }
 
 
-string const BufferView::getClipboard() const
+FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 {
-       return pimpl_->workarea().getClipboard();
+       return pimpl_->getStatus(cmd);
 }
 
 
-void BufferView::stuffClipboard(string const & stuff) const
+bool BufferView::dispatch(FuncRequest const & ev)
 {
-       pimpl_->stuffClipboard(stuff);
+       return pimpl_->dispatch(ev);
 }
 
 
-FuncStatus BufferView::getStatus(FuncRequest const & cmd)
+void BufferView::selectionRequested()
 {
-       return pimpl_->getStatus(cmd);
+       pimpl_->selectionRequested();
 }
 
 
-bool BufferView::dispatch(FuncRequest const & ev)
+void BufferView::selectionLost()
 {
-       return pimpl_->dispatch(ev);
+       pimpl_->selectionLost();
+}
+
+
+void BufferView::workAreaResize(int width, int height)
+{
+       pimpl_->workAreaResize(width, height);
+}
+
+
+void BufferView::workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state)
+{
+       pimpl_->workAreaKeyPress(key, state);
+}
+
+
+bool BufferView::workAreaDispatch(FuncRequest const & ev)
+{
+       return pimpl_->workAreaDispatch(ev);
 }
 
 
@@ -241,7 +257,7 @@ void BufferView::scroll(int lines)
 void BufferView::showErrorList(string const & action) const
 {
        if (getErrorList().size()) {
-               string const title = bformat(_("LyX: %1$s errors (%2$s)"),
+               string const title = bformat(_("%1$s Errors (%2$s)"),
                        action, buffer()->fileName());
                owner()->getDialogs().show("errorlist", title);
                pimpl_->errorlist_.clear();
@@ -275,9 +291,7 @@ void BufferView::gotoLabel(string const & label)
                vector<string> labels;
                it->getLabelList(*buffer(), labels);
                if (find(labels.begin(),labels.end(),label) != labels.end()) {
-                       cursor().clearSelection();
-                       text()->setCursor(cursor(), it.pit(), it.pos());
-                       cursor().resetAnchor();
+                       setCursor(it);
                        update();
                        return;
                }
@@ -287,7 +301,7 @@ void BufferView::gotoLabel(string const & label)
 
 void BufferView::hideCursor()
 {
-       screen().hideCursor();
+       pimpl_->gui().guiCursor().hide();
 }
 
 LyXText * BufferView::getLyXText()
@@ -306,15 +320,9 @@ LyXText const * BufferView::getLyXText() const
 }
 
 
-void BufferView::haveSelection(bool sel)
-{
-       pimpl_->workarea().haveSelection(sel);
-}
-
-
 int BufferView::workHeight() const
 {
-       return pimpl_->workarea().workHeight();
+       return pimpl_->height();
 }
 
 
@@ -324,24 +332,43 @@ LyXText * BufferView::text() const
 }
 
 
-void BufferView::setCursor(ParIterator const & par, lyx::pos_type pos)
+void BufferView::setCursor(DocIterator const & dit)
 {
-       for (int i = 0, n = par.size(); i < n; ++i)
-               par[i].inset().edit(cursor(), true);
+       size_t const n = dit.depth();
+       for (size_t i = 0; i < n; ++i)
+               dit[i].inset().edit(cursor(), true);
 
-       cursor().setCursor(makeDocIterator(par, pos));
+       cursor().setCursor(dit);
        cursor().selection() = false;
 }
 
 
+void BufferView::mouseSetCursor(LCursor & cur)
+{
+       BOOST_ASSERT(&cur.bv() == this);
+
+       // Has the cursor just left the inset?
+       if (&cursor().inset() != &cur.inset())
+               cursor().inset().notifyCursorLeaves(cursor());
+
+       // do the dEPM magic if needed
+       if (cursor().inTexted())
+               cursor().text()->deleteEmptyParagraphMechanism(cur, cursor());
+
+       cursor() = cur;
+       cursor().clearSelection();
+       cursor().setTargetX();
+       finishUndo();
+
+}
+
+
 void BufferView::putSelectionAt(DocIterator const & cur,
                                int length, bool backwards)
 {
-       ParIterator par(cur);
-
        cursor().clearSelection();
 
-       setCursor(par, cur.pos());
+       setCursor(cur);
 
        if (length) {
                if (backwards) {
@@ -375,3 +402,9 @@ int BufferView::offset_ref() const
 {
        return pimpl_->offset_ref_;
 }
+
+
+ViewMetricsInfo const & BufferView::viewMetricsInfo()
+{
+       return pimpl_->viewMetricsInfo();
+}