hopefully fix tex2lyx linking.

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index dbd108e6c112036d8fbf4de322325789190b5866..42a0c7cf1bfcc318e985ed8121705f6202d45f5e 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -285,7 +285,7 @@ void LCursor::dispatch(FuncRequest const & cmd0)
                // The common case is 'LFUN handled, need update', so make the
                // LFUN handler's life easier by assuming this as default value.
                // The handler can reset the update and val flags if necessary.
-               disp_.update(true);
+               disp_.update(Update::FitCursor | Update::Force);
                disp_.dispatched(true);
                inset().dispatch(*this, cmd);
                if (disp_.dispatched())
@@ -296,6 +296,7 @@ void LCursor::dispatch(FuncRequest const & cmd0)
        if (!disp_.dispatched()) {
                lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl;
                operator=(safe);
+               disp_.update(Update::None);
                disp_.dispatched(false);
        }
 }
@@ -477,7 +478,7 @@ void LCursor::setSelection()
 }
 
 
-void LCursor::setSelection(DocIterator const & where, size_t n)
+void LCursor::setSelection(DocIterator const & where, int n)
 {
        setCursor(where);
        selection() = true;
@@ -513,7 +514,7 @@ void LCursor::clearTargetX()
 
 
 
-void LCursor::info(std::ostream & os) const
+void LCursor::info(odocstream & os) const
 {
        for (int i = 1, n = depth(); i < n; ++i) {
                operator[](i).inset().infoize(os);
@@ -526,14 +527,15 @@ void LCursor::info(std::ostream & os) const
 }
 
 
-void LCursor::selHandle(bool sel)
+bool LCursor::selHandle(bool sel)
 {
        //lyxerr << "LCursor::selHandle" << endl;
        if (sel == selection())
-               return;
+               return false;
 
        resetAnchor();
        selection() = sel;
+       return true;
 }
 
 
@@ -568,13 +570,13 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 ///////////////////////////////////////////////////////////////////
 
 #include "mathed/InsetMathChar.h"
-#include "mathed/MathFactory.h"
 #include "mathed/InsetMathGrid.h"
-#include "mathed/MathMacroArgument.h"
-#include "mathed/MathMLStream.h"
 #include "mathed/InsetMathScript.h"
-#include "mathed/MathSupport.h"
 #include "mathed/InsetMathUnknown.h"
+#include "mathed/MathFactory.h"
+#include "mathed/MathMacroArgument.h"
+#include "mathed/MathStream.h"
+#include "mathed/MathSupport.h"
 
 
 namespace lyx {
@@ -656,7 +658,7 @@ void LCursor::plainInsert(MathAtom const & t)
 }
 
 
-void LCursor::insert(string const & str)
+void LCursor::insert(docstring const & str)
 {
        for_each(str.begin(), str.end(),
                 boost::bind(static_cast<void(LCursor::*)(char_type)>
@@ -695,11 +697,10 @@ void LCursor::insert(InsetBase * inset)
 }
 
 
-void LCursor::niceInsert(string const & t)
+void LCursor::niceInsert(docstring const & t)
 {
        MathArray ar;
-       // FIXME UNICODE
-       asArray(from_utf8(t), ar);
+       asArray(t, ar);
        if (ar.size() == 1)
                niceInsert(ar[0]);
        else
@@ -710,7 +711,7 @@ void LCursor::niceInsert(string const & t)
 void LCursor::niceInsert(MathAtom const & t)
 {
        macroModeClose();
-       string const safe = cap::grabAndEraseSelection(*this);
+       docstring const safe = cap::grabAndEraseSelection(*this);
        plainInsert(t);
        // enter the new inset and move the contents of the selection if possible
        if (t->isActive()) {
@@ -720,8 +721,7 @@ void LCursor::niceInsert(MathAtom const & t)
                pushLeft(*nextInset());
                // We may not use niceInsert here (recursion)
                MathArray ar;
-               // FIXME UNICODE
-               asArray(from_utf8(safe), ar);
+               asArray(safe, ar);
                insert(ar);
        }
 }
@@ -846,7 +846,7 @@ bool LCursor::macroModeClose()
                return false;
        InsetMathUnknown * p = activeMacro();
        p->finalize();
-       string const s = p->name();
+       docstring const s = p->name();
        --pos();
        cell().erase(pos());
 
@@ -857,7 +857,7 @@ bool LCursor::macroModeClose()
        // prevent entering of recursive macros
        // FIXME: this is only a weak attempt... only prevents immediate
        // recursion
-       string const name = s.substr(1);
+       docstring const name = s.substr(1);
        InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
        if (macro && macro->getInsetName() == name)
                lyxerr << "can't enter recursive macro" << endl;
@@ -870,9 +870,9 @@ bool LCursor::macroModeClose()
 }
 
 
-string LCursor::macroName()
+docstring LCursor::macroName()
 {
-       return inMacroMode() ? activeMacro()->name() : string();
+       return inMacroMode() ? activeMacro()->name() : docstring();
 }
 
 
@@ -880,8 +880,7 @@ void LCursor::handleNest(MathAtom const & a, int c)
 {
        //lyxerr << "LCursor::handleNest: " << c << endl;
        MathAtom t = a;
-       // FIXME UNICODE
-       asArray(from_utf8(cap::grabAndEraseSelection(*this)), t.nucleus()->cell(c));
+       asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
        insert(t);
        posLeft();
        pushLeft(*nextInset());
@@ -901,9 +900,6 @@ int LCursor::targetX() const
 
 void LCursor::setTargetX()
 {
-       // For now this is good enough. A better solution would be to
-       // avoid this rebreak by setting cursorX only after drawing
-       bottom().text()->redoParagraph(bottom().pit());
        int x;
        int y;
        getPos(x, y);
@@ -1076,7 +1072,7 @@ bool LCursor::goUpDown(bool up)
 void LCursor::handleFont(string const & font)
 {
        lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl;
-       string safe;
+       docstring safe;
        if (selection()) {
                macroModeClose();
                safe = cap::grabAndEraseSelection(*this);
@@ -1093,7 +1089,7 @@ void LCursor::handleFont(string const & font)
                } else {
                        // cursor in between. split cell
                        MathArray::iterator bt = cell().begin();
-                       MathAtom at = createInsetMath(font);
+                       MathAtom at = createInsetMath(from_utf8(font));
                        at.nucleus()->cell(0) = MathArray(bt, bt + pos());
                        cell().erase(bt, bt + pos());
                        popLeft();
@@ -1155,7 +1151,7 @@ docstring LCursor::selectionAsString(bool label) const
        }
 
        if (inMathed())
-               return from_utf8(cap::grabSelection(*this));
+               return cap::grabSelection(*this);
 
        return docstring();
 }
@@ -1164,9 +1160,9 @@ docstring LCursor::selectionAsString(bool label) const
 string LCursor::currentState()
 {
        if (inMathed()) {
-               std::ostringstream os;
+               odocstringstream os;
                info(os);
-               return os.str();
+               return to_utf8(os.str());
        }
 
        if (inTexted())
@@ -1176,9 +1172,9 @@ string LCursor::currentState()
 }
 
 
-string LCursor::getPossibleLabel()
+docstring LCursor::getPossibleLabel()
 {
-       return inMathed() ? "eq:" : text()->getPossibleLabel(*this);
+       return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
 }
 
 
@@ -1214,15 +1210,15 @@ void LCursor::dispatched()
 }
 
 
-void LCursor::needsUpdate()
+void LCursor::updateFlags(Update::flags f)
 {
-       disp_.update(true);
+       disp_.update(f);
 }
 
 
 void LCursor::noUpdate()
 {
-       disp_.update(false);
+       disp_.update(Update::None);
 }