#include <config.h>
#include "BufferView.h"
+#include "bufferview_funcs.h"
#include "buffer.h"
#include "cursor.h"
#include "coordcache.h"
#include "mathed/InsetMath.h"
#include "mathed/InsetMathScript.h"
#include "mathed/MathMacroTable.h"
-#include "mathed/MathParser.h"
#include "support/limited_stack.h"
#include <sstream>
#include <limits>
+#include <map>
namespace lyx {
using std::string;
using std::vector;
using std::endl;
-#ifndef CXX_GLOBAL_CSTD
-using std::isalpha;
-#endif
using std::min;
using std::for_each;
it.top().pos() = 0;
DocIterator et = c;
et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size();
- for (size_t i = 0; ; ++i) {
+ for (size_t i = 0;; ++i) {
int xo;
int yo;
InsetBase const * inset = &it.inset();
- Point o = c.bv().coordCache().getInsets().xy(inset);
+ 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_;
double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
- lyxerr[Debug::DEBUG] << "i: " << i << " d: " << d
+ LYXERR(Debug::DEBUG) << "i: " << i << " d: " << d
<< " best: " << best_dist << endl;
if (d <= best_dist) {
best_dist = d;
void LCursor::dispatch(FuncRequest const & cmd0)
{
- lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+ LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION
<< " cmd: " << cmd0 << '\n'
<< *this << endl;
if (empty())
LCursor safe = *this;
for (; depth(); pop()) {
- lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: "
+ LYXERR(Debug::DEBUG) << "LCursor::dispatch: cmd: "
<< cmd0 << endl << *this << endl;
BOOST_ASSERT(pos() <= lastpos());
BOOST_ASSERT(idx() <= lastidx());
// it completely to get a 'bomb early' behaviour in case this
// object will be used again.
if (!disp_.dispatched()) {
- lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl;
+ 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;
}
}
+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;
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 << " ";
}
resetAnchor();
selection() = sel;
+ cap::saveSelection(*this);
return true;
}
#include "mathed/InsetMathScript.h"
#include "mathed/InsetMathUnknown.h"
#include "mathed/MathFactory.h"
-#include "mathed/MathMacroArgument.h"
#include "mathed/MathStream.h"
#include "mathed/MathSupport.h"
autocorrect() = false;
if (selection()) {
- 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 {
+ if (inMathed())
+ pullArg();
+ else
+ popLeft();
+ return true;
+ }
}
if (inMacroMode()) {
return true;
if (selection()) {
- 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 (s == "\\")
return false;
- // prevent entering of recursive macros
- // FIXME: this is only a weak attempt... only prevents immediate
- // recursion
- 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;
+ // trigger updates of macros, at least, if no full
+ // updates take place anyway
+ updateFlags(Update::Force);
+ docstring const name = s.substr(1);
InsetMathNest * const in = inset().asInsetMath()->asNestInset();
if (in && in->interpretString(*this, s))
return true;
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);
void LCursor::handleFont(string const & font)
{
- lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl;
+ LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION << ": " << font << endl;
docstring safe;
if (selection()) {
macroModeClose();
}
-string LCursor::currentState()
+docstring LCursor::currentState()
{
if (inMathed()) {
odocstringstream os;
info(os);
- return to_utf8(os.str());
+ 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);
}
<< ", max is " << copy.lastidx()
<< " at level " << copy.depth()
<< ". Trying to correct this." << endl;
+ lyxerr << "old: " << *this << endl;
newdepth = copy.depth() - 1;
}
else if (copy.pit() > copy.lastpit()) {
<< ", max is " << copy.lastpit()
<< " at level " << copy.depth()
<< ". Trying to correct this." << endl;
+ lyxerr << "old: " << *this << endl;
newdepth = copy.depth() - 1;
}
else if (copy.pos() > copy.lastpos()) {
<< ", max is " << copy.lastpos()
<< " at level " << copy.depth()
<< ". Trying to correct this." << endl;
+ lyxerr << "old: " << *this << endl;
newdepth = copy.depth() - 1;
}
copy.pop();
while (depth() > newdepth) {
pop();
lyxerr << "correcting cursor to level " << depth() << endl;
+ lyxerr << "new: " << *this << endl;
+ clearSelection();
}
}