#include "paragraph_funcs.h"
#include "pariterator.h"
-#include "insets/updatableinset.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 "support/limited_stack.h"
positionable(DocIterator const & cursor, DocIterator const & anchor)
{
// avoid deeper nested insets when selecting
- if (cursor.size() > anchor.size())
+ if (cursor.depth() > anchor.depth())
return false;
// anchor might be deeper, should have same path then
- for (size_t i = 0; i < cursor.size(); ++i)
+ for (size_t i = 0; i < cursor.depth(); ++i)
if (&cursor[i].inset() != &anchor[i].inset())
return false;
DocIterator result;
DocIterator it = c;
- it.back().pos() = 0;
+ it.top().pos() = 0;
DocIterator et = c;
- et.back().pos() = et.back().asMathInset()->cell(et.back().idx()).size();
- for (int i = 0; ; ++i) {
- int xo, yo;
- LCursor cur = c;
- cur.setCursor(it);
- cur.inset().getCursorPos(cur.top(), xo, yo);
+ et.top().pos() = et.top().asMathInset()->cell(et.top().idx()).size();
+ for (size_t i = 0; ; ++i) {
+ int xo;
+ int yo;
+ it.inset().cursorPos(it.top(), c.boundary() && ((i+1) == it.depth()), xo, yo);
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'
int x, int y, int xlow, int xhigh, int ylow, int yhigh)
{
BOOST_ASSERT(!cursor.empty());
- CursorSlice bottom = cursor[0];
- LyXText * text = bottom.text();
- BOOST_ASSERT(text);
+ InsetBase & inset = cursor[0].inset();
- DocIterator it = doc_iterator_begin(bottom.inset());
- DocIterator const et = doc_iterator_end(bottom.inset());
+ DocIterator it = doc_iterator_begin(inset);
+ DocIterator const et = doc_iterator_end(inset);
double best_dist = std::numeric_limits<double>::max();;
DocIterator best_cursor = et;
// avoid invalid nesting when selecting
if (bv_funcs::status(&cursor.bv(), it) == bv_funcs::CUR_INSIDE
&& (!cursor.selection() || positionable(it, cursor.anchor_))) {
- Point p = bv_funcs::getPos(it);
+ Point p = bv_funcs::getPos(it, false);
int xo = p.x_;
int yo = p.y_;
if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
- double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
- //lyxerr << "xo: " << xo << " yo: " << yo << " d: " << d << endl;
+ double const dx = xo - x;
+ double const dy = yo - y;
+ double const d = dx * dx + dy * dy;
// '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a'
if (d <= best_dist) {
- //lyxerr << "*" << endl;
+ lyxerr << "*" << endl;
best_dist = d;
best_cursor = it;
}
}
}
- //lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
if (best_cursor != et) {
cursor.setCursor(best_cursor);
return true;
return false;
}
+
+ /// moves position closest to (x, y) in given box
+ bool bruteFind3(LCursor & cur, int x, int y, bool up)
+ {
+ BufferView & bv = cur.bv();
+ int ylow = up ? 0 : y + 1;
+ int yhigh = up ? y - 1 : bv.workHeight();
+ int xlow = 0;
+ int xhigh = bv.workWidth();
+
+// FIXME: bit more work needed to get 'from' and 'to' right.
+ pit_type from = cur.bottom().pit();
+ //pit_type to = cur.bottom().pit();
+ //lyxerr << "Pit start: " << from << endl;
+
+ //lyxerr << "bruteFind3: x: " << x << " y: " << y
+ // << " xlow: " << xlow << " xhigh: " << xhigh
+ // << " ylow: " << ylow << " yhigh: " << yhigh
+ // << endl;
+ InsetBase & inset = bv.buffer()->inset();
+ DocIterator it = doc_iterator_begin(inset);
+ it.pit() = from;
+ DocIterator et = doc_iterator_end(inset);
+
+ double best_dist = std::numeric_limits<double>::max();
+ DocIterator best_cursor = et;
+
+ for ( ; it != et; it.forwardPos()) {
+ // 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);
+ int xo = p.x_;
+ int yo = p.y_;
+ if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
+ double const dx = xo - x;
+ double const dy = yo - y;
+ double const d = dx * dx + dy * dy;
+ //lyxerr << "itx: " << xo << " ity: " << yo << " d: " << d
+ // << " dx: " << dx << " dy: " << dy
+ // << " idx: " << it.idx() << " pos: " << it.pos()
+ // << " it:\n" << it
+ // << endl;
+ // '<=' in order to take the last possible position
+ // this is important for clicking behind \sum in e.g. '\sum_i a'
+ if (d <= best_dist) {
+ //lyxerr << "*" << endl;
+ best_dist = d;
+ best_cursor = it;
+ }
+ }
+ }
+ }
+
+ //lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
+ if (best_cursor == et)
+ return false;
+ cur.setCursor(best_cursor);
+ return true;
+ }
+
} // namespace anon
// bv functions are not yet available!
LCursor::LCursor(BufferView & bv)
: DocIterator(), bv_(&bv), anchor_(), x_target_(-1),
- selection_(false), mark_(false)
+ selection_(false), mark_(false), logicalpos_(false)
{}
void LCursor::dispatch(FuncRequest const & cmd0)
{
- lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: "
- << cmd0 << endl << *this << endl;
+ lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+ << " cmd: " << cmd0 << '\n'
+ << *this << endl;
if (empty())
return;
+ fixIfBroken();
FuncRequest cmd = cmd0;
LCursor safe = *this;
- for (; size(); pop()) {
+ for (; depth(); pop()) {
lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: "
<< cmd0 << endl << *this << endl;
BOOST_ASSERT(pos() <= lastpos());
void LCursor::pop()
{
- BOOST_ASSERT(size() >= 1);
+ BOOST_ASSERT(depth() >= 1);
pop_back();
}
int LCursor::currentMode()
{
BOOST_ASSERT(!empty());
- for (int i = size() - 1; i >= 0; --i) {
+ for (int i = depth() - 1; i >= 0; --i) {
int res = operator[](i).inset().currentMode();
if (res != InsetBase::UNDECIDED_MODE)
return res;
void LCursor::getPos(int & x, int & y) const
{
- Point p = bv_funcs::getPos(*this);
+ Point p = bv_funcs::getPos(*this, boundary());
x = p.x_;
y = p.y_;
}
void LCursor::paste(string const & data)
{
- dispatch(FuncRequest(LFUN_PASTE, data));
+ if (!data.empty())
+ dispatch(FuncRequest(LFUN_PASTE, data));
}
CursorSlice LCursor::anchor() const
{
- BOOST_ASSERT(anchor_.size() >= size());
- CursorSlice normal = anchor_[size() - 1];
- if (size() < anchor_.size() && back() <= normal) {
+ BOOST_ASSERT(anchor_.depth() >= depth());
+ CursorSlice normal = anchor_[depth() - 1];
+ if (depth() < anchor_.depth() && top() <= normal) {
// anchor is behind cursor -> move anchor behind the inset
++normal.pos();
}
CursorSlice LCursor::selBegin() const
{
if (!selection())
- return back();
- return anchor() < back() ? anchor() : back();
+ return top();
+ return anchor() < top() ? anchor() : top();
}
CursorSlice LCursor::selEnd() const
{
if (!selection())
- return back();
- return anchor() > back() ? anchor() : back();
+ return top();
+ return anchor() > top() ? anchor() : top();
}
{
if (!selection())
return *this;
- return anchor() < back() ? anchor_ : *this;
+ return anchor() < top() ? anchor_ : *this;
}
{
if (!selection())
return *this;
- return anchor() > back() ? anchor_ : *this;
+ return anchor() > top() ? anchor_ : *this;
}
void LCursor::setSelection()
{
selection() = true;
- // a selection with no contents is not a selection
+ // A selection with no contents is not a selection
#ifdef WITH_WARNINGS
#warning doesnt look ok
#endif
std::ostream & operator<<(std::ostream & os, LCursor const & cur)
{
os << "\n cursor: | anchor:\n";
- for (size_t i = 0, n = cur.size(); i != n; ++i) {
- os << " " << cur.operator[](i) << " | ";
- if (i < cur.anchor_.size())
+ for (size_t i = 0, n = cur.depth(); i != n; ++i) {
+ os << " " << cur[i] << " | ";
+ if (i < cur.anchor_.depth())
os << cur.anchor_[i];
else
os << "-------------------------------";
os << "\n";
}
- for (size_t i = cur.size(), n = cur.anchor_.size(); i < n; ++i) {
+ for (size_t i = cur.depth(), n = cur.anchor_.depth(); i < n; ++i) {
os << "------------------------------- | " << cur.anchor_[i] << "\n";
}
os << " selection: " << cur.selection_
bool LCursor::isInside(InsetBase const * p)
{
- for (unsigned i = 0; i < depth(); ++i)
+ for (size_t i = 0; i != depth(); ++i)
if (&operator[](i).inset() == p)
return true;
return false;
}
+void LCursor::leaveInset(InsetBase const & inset)
+{
+ for (size_t i = 0; i != depth(); ++i) {
+ if (&operator[](i).inset() == &inset) {
+ resize(i);
+ return;
+ }
+ }
+}
+
+
bool LCursor::openable(MathAtom const & t) const
{
if (!t->isActive())
return true;
// we can't move into anything new during selection
- if (depth() >= anchor_.size())
+ if (depth() >= anchor_.depth())
return false;
if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset()))
return false;
void LCursor::niceInsert(MathAtom const & t)
{
macroModeClose();
- string safe = lyx::cap::grabAndEraseSelection(*this);
+ string const safe = lyx::cap::grabAndEraseSelection(*this);
plainInsert(t);
// enter the new inset and move the contents of the selection if possible
if (t->isActive()) {
}
// 'clever' UI hack: only erase large items if previously slected
- if (pos() != lastpos() && inset().nargs() > 0) {
+ if (pos() != lastpos() && nextAtom()->nargs() > 0) {
resetAnchor();
selection() = true;
++pos();
return;
MathUnknownInset * p = activeMacro();
p->finalize();
- string s = p->name();
+ string const s = p->name();
--pos();
cell().erase(pos());
void LCursor::setTargetX()
{
- //for now this is good enough. A better solution would be to
- //avoid this rebreak by setting cursorX only after drawing
+ // 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, y;
+ int x;
+ int y;
getPos(x, y);
x_target_ = x;
}
void LCursor::normalize()
{
- if (idx() >= nargs()) {
+ if (idx() > lastidx()) {
lyxerr << "this should not really happen - 1: "
<< idx() << ' ' << nargs()
<< " in: " << &inset() << endl;
+ idx() = lastidx();
}
- idx() = min(idx(), lastidx());
if (pos() > lastpos()) {
lyxerr << "this should not really happen - 2: "
WriteStream wi(lyxerr, false, true);
inset().asMathInset()->write(wi);
lyxerr << endl;
+ pos() = lastpos();
}
- pos() = min(pos(), lastpos());
}
MathScriptInset const * p = prevAtom()->asScriptInset();
if (p && p->has(up)) {
--pos();
- push(inset());
- idx() = up; // the superscript has index 1
+ push(*const_cast<MathScriptInset*>(p));
+ idx() = p->idxOfScript(up);
pos() = lastpos();
- //lyxerr << "updown: handled by scriptinset to the left" << endl;
return true;
}
}
if (pos() != lastpos()) {
MathScriptInset const * p = nextAtom()->asScriptInset();
if (p && p->has(up)) {
- push(inset());
- idx() = up;
+ push(*const_cast<MathScriptInset*>(p));
+ idx() = p->idxOfScript(up);
pos() = 0;
- //lyxerr << "updown: handled by scriptinset to the right" << endl;
return true;
}
}
}
+// FIXME: Switch this on for more robust movement
+#if 0
+
+ return bruteFind3(*this, xo, yo, up);
+
+#else
//xarray().boundingBox(xlow, xhigh, ylow, yhigh);
//if (up)
// yhigh = yo - 4;
//}
// try to find an inset that knows better then we
- while (1) {
- //lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
+ while (true) {
+ lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
// ask inset first
if (inset().idxUpDown(*this, up)) {
+ lyxerr << "idxUpDown triggered" << endl;
// try to find best position within this inset
if (!selection())
setCursor(bruteFind2(*this, xo, yo));
}
// no such inset found, just take something "above"
- //lyxerr << "updown: handled by strange case" << endl;
if (!popLeft()) {
+ lyxerr << "updown: popleft failed (strange case)" << endl;
int ylow = up ? 0 : yo + 1;
int yhigh = up ? yo - 1 : bv().workHeight();
return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
}
// any improvement so far?
- int xnew, ynew;
+ lyxerr << "updown: popLeft succeeded" << endl;
+ int xnew;
+ int ynew;
getPos(xnew, ynew);
if (up ? ynew < yo : ynew > yo)
return true;
// we should not come here.
BOOST_ASSERT(false);
+#endif
}
if (inTexted()) {
Buffer const & buffer = *bv().buffer();
- ParagraphList & pars = text()->paragraphs();
+ ParagraphList const & pars = text()->paragraphs();
// should be const ...
pit_type startpit = selBegin().pit();
// The paragraphs in between (if any)
for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
- Paragraph & par = pars[pit];
+ Paragraph const & par = pars[pit];
result += par.asString(buffer, 0, par.size(), label) + "\n\n";
}
return result;
}
-#ifdef WITH_WARNINGS
-#warning and mathed?
-#endif
+ if (inMathed())
+ return lyx::cap::grabSelection(*this);
+
return string();
}
}
if (inTexted())
- return text()->currentState(*this);
+ return text()->currentState(*this);
return string();
}
int s = 0;
// go up until first non-0 text is hit
// (innermost text is 0 in mathed)
- for (s = size() - 1; s >= 0; --s)
+ for (s = depth() - 1; s >= 0; --s)
if (operator[](s).text())
break;
CursorSlice const & sl = operator[](s);
- LyXText & text = *sl.text();
+ LyXText const & text = *sl.text();
LyXFont font = text.getPar(sl.pit()).getFont(
bv().buffer()->params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
return font.language()->encoding();
int s = 0;
// go up until first non-0 text is hit
// (innermost text is 0 in mathed)
- for (s = size() - 1; s >= 0; --s)
+ for (s = depth() - 1; s >= 0; --s)
if (operator[](s).text())
break;
CursorSlice const & sl = operator[](s);
- LyXText & text = *sl.text();
+ LyXText const & text = *sl.text();
LyXFont font = text.getPar(sl.pit()).getFont(
bv().buffer()->params(),
sl.pos(),
outerFont(sl.pit(), text.paragraphs()));
- for (; s < size(); ++s)
- ;
+
return font;
}
+
+
+void LCursor::fixIfBroken()
+{
+ // find out last good level
+ LCursor copy = *this;
+ size_t newdepth = depth();
+ while (!copy.empty()) {
+ if (copy.idx() > copy.lastidx()) {
+ lyxerr << "wrong idx " << copy.idx()
+ << ", max is " << copy.lastidx()
+ << " at level " << copy.depth()
+ << ". Trying to correct this." << endl;
+ newdepth = copy.depth() - 1;
+ }
+ else if (copy.pit() > copy.lastpit()) {
+ lyxerr << "wrong pit " << copy.pit()
+ << ", max is " << copy.lastpit()
+ << " at level " << copy.depth()
+ << ". Trying to correct this." << endl;
+ newdepth = copy.depth() - 1;
+ }
+ else if (copy.pos() > copy.lastpos()) {
+ lyxerr << "wrong pos " << copy.pos()
+ << ", max is " << copy.lastpos()
+ << " at level " << copy.depth()
+ << ". Trying to correct this." << endl;
+ newdepth = copy.depth() - 1;
+ }
+ copy.pop();
+ }
+ // shrink cursor to a size where everything is valid, possibly
+ // leaving insets
+ while (depth() > newdepth) {
+ pop();
+ lyxerr << "correcting cursor to level " << depth() << endl;
+ }
+}
projects / lyx.git / blobdiff