typo

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 33536fae0711cb1da807bd555a4db4ce97700d91..e4a34b158ce88590237ee7ad3c4c75ec6b118409 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -49,11 +49,12 @@
 #include "mathed/MathData.h"
 #include "mathed/MathMacro.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <sstream>
 #include <limits>
 #include <map>
+#include <algorithm>
 
 using namespace std;
 
@@ -215,7 +216,9 @@ bool bruteFind3(Cursor & cur, int x, int y, bool up)
                // avoid invalid nesting when selecting
                if (bv.cursorStatus(it) == CUR_INSIDE
                                && (!cur.selection() || positionable(it, cur.realAnchor()))) {
-                       Point p = bv.getPos(it, false);
+                       // If this function is ever used again, check whether this
+                       // is the same as "bv.getPos(it, false)" with boundary = false.
+                       Point p = bv.getPos(it);
                        int xo = p.x_;
                        int yo = p.y_;
                        if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
@@ -467,7 +470,7 @@ int Cursor::currentMode()
 
 void Cursor::getPos(int & x, int & y) const
 {
-       Point p = bv().getPos(*this, boundary());
+       Point p = bv().getPos(*this);
        x = p.x_;
        y = p.y_;
 }
@@ -1273,13 +1276,14 @@ void Cursor::plainInsert(MathAtom const & t)
        ++pos();
        inset().setBuffer(bv_->buffer());
        inset().initView();
+       forceBufferUpdate();
 }
 
 
 void Cursor::insert(docstring const & str)
 {
        for_each(str.begin(), str.end(),
-                boost::bind(static_cast<void(Cursor::*)(char_type)>
+                bind(static_cast<void(Cursor::*)(char_type)>
                             (&Cursor::insert), this, _1));
 }
 
@@ -1315,6 +1319,8 @@ void Cursor::insert(Inset * inset0)
                text()->insertInset(*this, inset0);
                inset0->setBuffer(bv_->buffer());
                inset0->initView();
+               if (inset0->isLabeled())
+                       forceBufferUpdate();
        }
 }
 
@@ -1356,7 +1362,7 @@ void Cursor::insert(MathData const & ar)
                cap::eraseSelection(*this);
        cell().insert(pos(), ar);
        pos() += ar.size();
-       // FIXME audit setBuffer/updateBuffer calls
+       // FIXME audit setBuffer calls
        inset().setBuffer(bv_->buffer());
 }
 
@@ -1507,7 +1513,7 @@ bool Cursor::macroModeClose()
 
        // trigger updates of macros, at least, if no full
        // updates take place anyway
-       updateFlags(Update::Force);
+       screenUpdateFlags(Update::Force);
 
        docstring const name = s.substr(1);
        InsetMathNest * const in = inset().asInsetMath()->asNestInset();
@@ -1880,13 +1886,15 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 
                        updateNeeded |= bv().checkDepm(dummy, *this);
                        updateTextTargetOffset();
+                       if (updateNeeded)
+                               forceBufferUpdate();
                }
                return false;
        }
 
        // with and without selection are handled differently
        if (!selection()) {
-               int yo = bv().getPos(*this, boundary()).y_;
+               int yo = bv().getPos(*this).y_;
                Cursor old = *this;
                // To next/previous row
                if (up)
@@ -1904,7 +1912,7 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
                        ++dummy.pos();
                if (bv().checkDepm(dummy, old)) {
                        updateNeeded = true;
-                       // Make sure that cur gets back whatever happened to dummy(Lgb) 
+                       // Make sure that cur gets back whatever happened to dummy (Lgb) 
                        operator=(dummy);
                }
        } else {
@@ -1949,6 +1957,8 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
                updateNeeded |= bv().checkDepm(*this, old);
        }
 
+       if (updateNeeded)
+               forceBufferUpdate();
        updateTextTargetOffset();
        return true;
 }      
@@ -2110,13 +2120,31 @@ void Cursor::dispatched()
 }
 
 
-void Cursor::updateFlags(Update::flags f)
+void Cursor::screenUpdateFlags(Update::flags f)
 {
        disp_.update(f);
 }
 
 
-void Cursor::noUpdate()
+void Cursor::forceBufferUpdate()
+{
+       disp_.forceBufferUpdate();
+}
+
+
+void Cursor::clearBufferUpdate()
+{
+       disp_.clearBufferUpdate();
+}
+
+
+bool Cursor::needBufferUpdate() const
+{
+       return disp_.needBufferUpdate();
+}
+
+
+void Cursor::noScreenUpdate()
 {
        disp_.update(Update::None);
 }