#include <config.h>
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "buffer.h"
#include "cursor.h"
#include "coordcache.h"
#include "insets/insettabular.h"
#include "insets/insettext.h"
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
-#include "mathed/math_scriptinset.h"
-#include "mathed/math_macrotable.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathMacroTable.h"
#include "support/limited_stack.h"
-#include "frontends/LyXView.h"
-#include "frontends/font_metrics.h"
-
#include <boost/assert.hpp>
#include <boost/bind.hpp>
#include <boost/current_function.hpp>
#include <sstream>
#include <limits>
+#include <map>
-using lyx::pit_type;
+namespace lyx {
using std::string;
using std::vector;
using std::isalpha;
#endif
using std::min;
-using std::swap;
+using std::for_each;
namespace {
DocIterator it = c;
it.top().pos() = 0;
DocIterator et = c;
- et.top().pos() = et.top().asMathInset()->cell(et.top().idx()).size();
+ et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size();
for (size_t i = 0; ; ++i) {
int xo;
int yo;
InsetBase const * inset = &it.inset();
- Point o = theCoords.getInsets().xy(inset);
- inset->cursorPos(it.top(), c.boundary(), xo, yo);
+ std::map<InsetBase const *, Point> const & data =
+ c.bv().coordCache().getInsets().getData();
+ std::map<InsetBase const *, Point>::const_iterator I = data.find(inset);
+
+ // FIXME: in the case where the inset is not in the cache, this
+ // means that no part of it is visible on screen. In this case
+ // we don't do elaborate search and we just return the forwarded
+ // DocIterator at its beginning.
+ if (I == data.end()) {
+ it.top().pos() = 0;
+ return it;
+ }
+
+ Point o = I->second;
+ inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo);
// Convert to absolute
xo += o.x_;
yo += o.y_;
{
BOOST_ASSERT(!cursor.empty());
InsetBase & inset = cursor[0].inset();
+ BufferView & bv = cursor.bv();
- CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second;
+ CoordCache::InnerParPosCache const & cache =
+ bv.coordCache().getParPos().find(cursor.bottom().text())->second;
// Get an iterator on the first paragraph in the cache
DocIterator it(inset);
it.push_back(CursorSlice(inset));
et.pit() = boost::prior(cache.end())->first;
if (et.pit() >= et.lastpit())
et = doc_iterator_end(inset);
- else
+ else
++et.pit();
double best_dist = std::numeric_limits<double>::max();;
for ( ; it != et; it.forwardPos(true)) {
// avoid invalid nesting when selecting
if (!cursor.selection() || positionable(it, cursor.anchor_)) {
- Point p = bv_funcs::getPos(it, false);
+ Point p = bv_funcs::getPos(bv, it, false);
int xo = p.x_;
int yo = p.y_;
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
//lyxerr << "Pit start: " << from << endl;
//lyxerr << "bruteFind3: x: " << x << " y: " << y
- // << " xlow: " << xlow << " xhigh: " << xhigh
- // << " ylow: " << ylow << " yhigh: " << yhigh
+ // << " xlow: " << xlow << " xhigh: " << xhigh
+ // << " ylow: " << ylow << " yhigh: " << yhigh
// << endl;
InsetBase & inset = bv.buffer()->inset();
DocIterator it = doc_iterator_begin(inset);
// avoid invalid nesting when selecting
if (bv_funcs::status(&bv, it) == bv_funcs::CUR_INSIDE
&& (!cur.selection() || positionable(it, cur.anchor_))) {
- Point p = bv_funcs::getPos(it, false);
+ Point p = bv_funcs::getPos(bv, it, false);
int xo = p.x_;
int yo = p.y_;
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
// 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())
if (!disp_.dispatched()) {
lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl;
operator=(safe);
+ disp_.update(Update::None);
disp_.dispatched(false);
}
}
{
BOOST_ASSERT(!empty());
//lyxerr << "Leaving inset to the right" << endl;
+ const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0;
inset().notifyCursorLeaves(*this);
if (depth() == 1)
return false;
pop();
- ++pos();
+ pos() += lastpos() - lp + 1;
return true;
}
void LCursor::getPos(int & x, int & y) const
{
- Point p = bv_funcs::getPos(*this, boundary());
+ Point p = bv_funcs::getPos(bv(), *this, boundary());
x = p.x_;
y = p.y_;
}
+Row const & LCursor::textRow() const
+{
+ ParagraphMetrics const & pm = bv().parMetrics(text(), pit());
+ BOOST_ASSERT(!pm.rows().empty());
+ return pm.getRow(pos(), boundary());
+}
+
+
void LCursor::resetAnchor()
{
anchor_ = *this;
}
-void LCursor::setSelection(DocIterator const & where, size_t n)
+void LCursor::setSelection(DocIterator const & where, int n)
{
setCursor(where);
selection() = true;
selection() = false;
mark() = false;
resetAnchor();
- bv().unsetXSel();
}
-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);
os << " ";
}
- if (pos() != 0)
- prevInset()->infoize2(os);
+ if (pos() != 0) {
+ InsetBase const * inset = prevInset();
+ // prevInset() can return 0 in certain case.
+ if (inset)
+ prevInset()->infoize2(os);
+ }
// overwite old message
os << " ";
}
-void LCursor::selHandle(bool sel)
+bool LCursor::selHandle(bool sel)
{
//lyxerr << "LCursor::selHandle" << endl;
if (sel == selection())
- return;
+ return false;
resetAnchor();
selection() = sel;
+ cap::saveSelection(*this);
+ return true;
}
return os;
}
-
+} // namespace lyx
///////////////////////////////////////////////////////////////////
//
// The part below is the non-integrated rest of the original math
// cursor. This should be either generalized for texted or moved
-// back to mathed (in most cases to MathNestInset).
+// back to mathed (in most cases to InsetMathNest).
//
///////////////////////////////////////////////////////////////////
-#include "mathed/math_charinset.h"
-#include "mathed/math_factory.h"
-#include "mathed/math_gridinset.h"
-#include "mathed/math_macroarg.h"
-#include "mathed/math_mathmlstream.h"
-#include "mathed/math_scriptinset.h"
-#include "mathed/math_support.h"
-#include "mathed/math_unknowninset.h"
+#include "mathed/InsetMathChar.h"
+#include "mathed/InsetMathGrid.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/InsetMathUnknown.h"
+#include "mathed/MathFactory.h"
+#include "mathed/MathStream.h"
+#include "mathed/MathSupport.h"
+
+
+namespace lyx {
//#define FILEDEBUG 1
void LCursor::markInsert()
{
- insert(char(0));
+ insert(char_type(0));
}
}
-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)>
+ boost::bind(static_cast<void(LCursor::*)(char_type)>
(&LCursor::insert), this, _1));
}
-void LCursor::insert(char c)
+void LCursor::insert(char_type c)
{
//lyxerr << "LCursor::insert char '" << c << "'" << endl;
BOOST_ASSERT(!empty());
if (inMathed()) {
- lyx::cap::selClearOrDel(*this);
- insert(new MathCharInset(c));
+ cap::selClearOrDel(*this);
+ insert(new InsetMathChar(c));
} else {
text()->insertChar(*this, c);
}
{
//lyxerr << "LCursor::insert MathAtom '" << t << "'" << endl;
macroModeClose();
- lyx::cap::selClearOrDel(*this);
+ cap::selClearOrDel(*this);
plainInsert(t);
}
}
-void LCursor::niceInsert(string const & t)
+void LCursor::niceInsert(docstring const & t)
{
MathArray ar;
asArray(t, ar);
void LCursor::niceInsert(MathAtom const & t)
{
macroModeClose();
- string const safe = lyx::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()) {
{
macroModeClose();
if (selection())
- lyx::cap::eraseSelection(*this);
+ cap::eraseSelection(*this);
cell().insert(pos(), ar);
pos() += ar.size();
}
autocorrect() = false;
if (selection()) {
- lyx::cap::selDel(*this);
+ cap::eraseSelection(*this);
return true;
}
if (pos() == 0) {
- if (inset().nargs() == 1 && depth() == 1 && lastpos() == 0)
+ // If empty cell, and not part of a big cell
+ if (lastpos() == 0 && inset().nargs() == 1) {
+ popLeft();
+ // Directly delete empty cell: [|[]] => [|]
+ if (inMathed()) {
+ plainErase();
+ resetAnchor();
+ return true;
+ }
+ // [|], can not delete from inside
return false;
- pullArg();
- return true;
+ } else {
+ // move to left
+ popLeft();
+ return true;
+ }
}
if (inMacroMode()) {
- MathUnknownInset * p = activeMacro();
+ InsetMathUnknown * p = activeMacro();
if (p->name().size() > 1) {
p->setName(p->name().substr(0, p->name().size() - 1));
return true;
return true;
if (selection()) {
- lyx::cap::selDel(*this);
+ cap::eraseSelection(*this);
return true;
}
// special behaviour when in last position of cell
if (pos() == lastpos()) {
bool one_cell = inset().nargs() == 1;
- if (one_cell && depth() == 1 && lastpos() == 0)
+ if (one_cell && lastpos() == 0) {
+ popLeft();
+ // Directly delete empty cell: [|[]] => [|]
+ if (inMathed()) {
+ plainErase();
+ resetAnchor();
+ return true;
+ }
+ // [|], can not delete from inside
return false;
+ }
// remove markup
- if (one_cell)
- pullArg();
- else
+ if (!one_cell)
inset().idxGlue(idx());
return true;
}
{
if (!inMacroMode())
return false;
- MathUnknownInset * p = activeMacro();
+ InsetMathUnknown * p = activeMacro();
p->finalize();
- string const s = p->name();
+ docstring const s = p->name();
--pos();
cell().erase(pos());
// 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;
- plainInsert(createMathInset(name));
+ InsetMathNest * const in = inset().asInsetMath()->asNestInset();
+ if (in && in->interpretString(*this, s))
+ return true;
+ plainInsert(createInsetMath(name));
return true;
}
-string LCursor::macroName()
+docstring LCursor::macroName()
{
- return inMacroMode() ? activeMacro()->name() : string();
+ return inMacroMode() ? activeMacro()->name() : docstring();
}
{
//lyxerr << "LCursor::handleNest: " << c << endl;
MathAtom t = a;
- asArray(lyx::cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
+ asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
insert(t);
posLeft();
pushLeft(*nextInset());
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);
{
if (pos() == 0)
return false;
- MathUnknownInset const * p = prevAtom()->asUnknownInset();
+ InsetMathUnknown const * p = prevAtom()->asUnknownInset();
return p && !p->final();
}
-MathUnknownInset * LCursor::activeMacro()
+InsetMathUnknown * LCursor::activeMacro()
{
return inMacroMode() ? prevAtom().nucleus()->asUnknownInset() : 0;
}
lyxerr << "this should not really happen - 2: "
<< pos() << ' ' << lastpos() << " in idx: " << idx()
<< " in atom: '";
- WriteStream wi(lyxerr, false, true);
- inset().asMathInset()->write(wi);
- lyxerr << endl;
+ odocstringstream os;
+ WriteStream wi(os, false, true);
+ inset().asInsetMath()->write(wi);
+ lyxerr << to_utf8(os.str()) << endl;
pos() = lastpos();
}
}
int yo = 0;
getPos(xo, yo);
- // check if we had something else in mind, if not, this is the future goal
+ // check if we had something else in mind, if not, this is the future
+ // target
if (x_target() == -1)
x_target() = xo;
else
if (!selection()) {
// try left
if (pos() != 0) {
- MathScriptInset const * p = prevAtom()->asScriptInset();
+ InsetMathScript const * p = prevAtom()->asScriptInset();
if (p && p->has(up)) {
--pos();
- push(*const_cast<MathScriptInset*>(p));
+ push(*const_cast<InsetMathScript*>(p));
idx() = p->idxOfScript(up);
pos() = lastpos();
return true;
// try right
if (pos() != lastpos()) {
- MathScriptInset const * p = nextAtom()->asScriptInset();
+ InsetMathScript const * p = nextAtom()->asScriptInset();
if (p && p->has(up)) {
- push(*const_cast<MathScriptInset*>(p));
+ push(*const_cast<InsetMathScript*>(p));
idx() = p->idxOfScript(up);
pos() = 0;
return true;
// FIXME: Switch this on for more robust movement
#if 0
- return bruteFind3(*this, xo, yo, up);
+ return bruteFind3(*this, xo, yo, up);
#else
//xarray().boundingBox(xlow, xhigh, ylow, yhigh);
void LCursor::handleFont(string const & font)
{
lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl;
- string safe;
+ docstring safe;
if (selection()) {
macroModeClose();
- safe = lyx::cap::grabAndEraseSelection(*this);
+ safe = cap::grabAndEraseSelection(*this);
}
if (lastpos() != 0) {
} else {
// cursor in between. split cell
MathArray::iterator bt = cell().begin();
- MathAtom at = createMathInset(font);
+ MathAtom at = createInsetMath(from_utf8(font));
at.nucleus()->cell(0) = MathArray(bt, bt + pos());
cell().erase(bt, bt + pos());
popLeft();
}
-void LCursor::message(string const & msg) const
+void LCursor::message(docstring const & msg) const
{
- bv().owner()->getLyXFunc().setMessage(msg);
+ theLyXFunc().setMessage(msg);
}
-void LCursor::errorMessage(string const & msg) const
+void LCursor::errorMessage(docstring const & msg) const
{
- bv().owner()->getLyXFunc().setErrorMessage(msg);
+ theLyXFunc().setErrorMessage(msg);
}
-string LCursor::selectionAsString(bool label) const
+docstring LCursor::selectionAsString(bool label) const
{
if (!selection())
- return string();
+ return docstring();
if (inTexted()) {
Buffer const & buffer = *bv().buffer();
return pars[startpit].asString(buffer, startpos, endpos, label);
// First paragraph in selection
- string result = pars[startpit].
+ docstring result = pars[startpit].
asString(buffer, startpos, pars[startpit].size(), label) + "\n\n";
// The paragraphs in between (if any)
}
if (inMathed())
- return lyx::cap::grabSelection(*this);
+ return cap::grabSelection(*this);
- return string();
+ return docstring();
}
-string LCursor::currentState()
+docstring LCursor::currentState()
{
if (inMathed()) {
- std::ostringstream os;
+ odocstringstream os;
info(os);
return os.str();
}
if (inTexted())
return text()->currentState(*this);
- return string();
+ return docstring();
}
-string LCursor::getPossibleLabel()
+docstring LCursor::getPossibleLabel()
{
- return inMathed() ? "eq:" : text()->getPossibleLabel(*this);
+ return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
}
}
-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);
}
lyxerr << "correcting cursor to level " << depth() << endl;
}
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff