#include "mathed/math_macrotable.h"
#include "support/limited_stack.h"
-#include "support/std_sstream.h"
#include "frontends/LyXView.h"
#include <boost/assert.hpp>
+#include <boost/bind.hpp>
+#include <boost/current_function.hpp>
-using lyx::par_type;
+#include <sstream>
+
+using lyx::pit_type;
using std::string;
using std::vector;
using std::min;
using std::swap;
+namespace {
+
+ bool
+ positionable(DocIterator const & cursor, DocIterator const & anchor)
+ {
+ // avoid deeper nested insets when selecting
+ if (cursor.size() > anchor.size())
+ return false;
+
+ // anchor might be deeper, should have same path then
+ for (size_t i = 0; i < cursor.size(); ++i)
+ if (&cursor[i].inset() != &anchor[i].inset())
+ return false;
+
+ // position should be ok.
+ return true;
+ }
+
+
+ // Find position closest to (x, y) in cell given by iter.
+ DocIterator bruteFind2(LCursor const & c, int x, int y)
+ {
+ double best_dist = 1e10;
+
+ DocIterator result;
+
+ DocIterator it = c;
+ it.back().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, 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'
+ lyxerr[Debug::DEBUG] << "i: " << i << " d: " << d << " best: " << best_dist << endl;
+ if (d <= best_dist) {
+ best_dist = d;
+ result = it;
+ }
+ if (it == et)
+ break;
+ it.forwardPos();
+ }
+ return result;
+ }
+
+
+ /// moves position closest to (x, y) in given box
+ bool bruteFind(LCursor & cursor,
+ int x, int y, int xlow, int xhigh, int ylow, int yhigh)
+ {
+ BOOST_ASSERT(!cursor.empty());
+ pit_type beg, end;
+ CursorSlice bottom = cursor[0];
+ LyXText * text = bottom.text();
+ BOOST_ASSERT(text);
+ getParsInRange(text->paragraphs(), ylow, yhigh, beg, end);
+
+ DocIterator it = doc_iterator_begin(cursor.bv().buffer()->inset());
+ DocIterator et = doc_iterator_end(cursor.bv().buffer()->inset());
+ //lyxerr << "x: " << x << " y: " << y << endl;
+ //lyxerr << "xlow: " << xlow << " ylow: " << ylow << endl;
+ //lyxerr << "xhigh: " << xhigh << " yhigh: " << yhigh << endl;
+
+ it.pit() = beg;
+ //et.pit() = text->parOffset(end);
+
+ double best_dist = 10e10;
+ DocIterator best_cursor = it;
+
+ for ( ; it != et; it.forwardPos()) {
+ // avoid invalid nesting when selecting
+ if (!cursor.selection() || positionable(it, cursor.anchor_)) {
+ int xo = 0, yo = 0;
+ LCursor cur = cursor;
+ cur.setCursor(it);
+ cur.inset().getCursorPos(cur, xo, yo);
+ 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;
+ // '<=' 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_dist < 1e10)
+ cursor.setCursor(best_cursor);
+ return best_dist < 1e10;
+ }
+
+
+} // namespace anon
+
LCursor::LCursor(BufferView & bv)
: DocIterator(), bv_(&bv), anchor_(), x_target_(-1),
}
-void LCursor::setCursor(DocIterator const & cur, bool sel)
+// this (intentionally) does neither touch anchor nor selection status
+void LCursor::setCursor(DocIterator const & cur)
{
- // this (intentionally) does not touch the anchor
DocIterator::operator=(cur);
- selection() = sel;
}
-DispatchResult LCursor::dispatch(FuncRequest const & cmd0)
+void LCursor::dispatch(FuncRequest const & cmd0)
{
- lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
+ lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
if (empty())
- return DispatchResult();
+ return;
FuncRequest cmd = cmd0;
LCursor safe = *this;
- for ( ; size(); pop()) {
- //lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
+ for (; size(); pop()) {
+ lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
BOOST_ASSERT(pos() <= lastpos());
BOOST_ASSERT(idx() <= lastidx());
- BOOST_ASSERT(par() <= lastpar());
+ BOOST_ASSERT(pit() <= lastpit());
// The common case is 'LFUN handled, need update', so make the
// LFUN handler's life easier by assuming this as default value.
// it completely to get a 'bomb early' behaviour in case this
// object will be used again.
if (!disp_.dispatched()) {
- lyxerr << "RESTORING OLD CURSOR!" << endl;
+ lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl;
operator=(safe);
disp_.dispatched(false);
}
+}
+
+
+DispatchResult LCursor::result() const
+{
return disp_;
}
bool res = false;
for ( ; size(); pop()) {
//lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
- BOOST_ASSERT(pos() <= lastpos());
- BOOST_ASSERT(idx() <= lastidx());
- BOOST_ASSERT(par() <= lastpar());
+ if (idx() > lastidx()) {
+ lyxerr << "wrong idx " << idx() << ", max is " << lastidx()
+ << ". Trying to correct this." << endl;
+ idx() = lastidx();
+ }
+ if (pit() > lastpit()) {
+ lyxerr << "wrong par " << pit() << ", max is " << lastpit()
+ << ". Trying to correct this." << endl;
+ pit() = lastpit();
+ }
+ if (pos() > lastpos()) {
+ lyxerr << "wrong pos " << pos() << ", max is " << lastpos()
+ << ". Trying to correct this." << endl;
+ pos() = lastpos();
+ }
// The inset's getStatus() will return 'true' if it made
// a definitive decision on whether it want to handle the
{
selection() = true;
// a selection with no contents is not a selection
+#ifdef WITH_WARNINGS
#warning doesnt look ok
- if (par() == anchor().par() && pos() == anchor().pos())
+#endif
+ if (pit() == anchor().pit() && pos() == anchor().pos())
selection() = false;
}
void LCursor::setSelection(DocIterator const & where, size_t n)
{
- setCursor(where, true);
+ setCursor(where);
+ selection() = true;
anchor_ = where;
pos() += n;
}
void LCursor::selHandle(bool sel)
{
//lyxerr << "LCursor::selHandle" << endl;
- if (sel == selection()) {
-#warning Alfredo: This is too strong (Andre)
- //if (!sel)
- // noUpdate();
+ if (sel == selection())
return;
- }
-
+
resetAnchor();
selection() = sel;
}
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())
}
-bool positionable(DocIterator const & cursor,
- DocIterator const & anchor)
-{
- // avoid deeper nested insets when selecting
- if (cursor.size() > anchor.size())
- return false;
-
- // anchor might be deeper, should have same path then
- for (size_t i = 0; i < cursor.size(); ++i)
- if (&cursor[i].inset() != &anchor[i].inset())
- return false;
-
- // position should be ok.
- return true;
-}
-
-
void LCursor::setScreenPos(int x, int y)
{
x_target() = x;
- bruteFind(x, y, 0, bv().workWidth(), 0, bv().workHeight());
+ bruteFind(*this, x, y, 0, bv().workWidth(), 0, bv().workHeight());
}
void LCursor::insert(string const & str)
{
- //lyxerr << "LCursor::insert str '" << str << "'" << endl;
- for (string::const_iterator it = str.begin(); it != str.end(); ++it)
- insert(*it);
+ for_each(str.begin(), str.end(),
+ boost::bind(static_cast<void(LCursor::*)(char)>
+ (&LCursor::insert), this, _1));
}
void LCursor::insert(MathAtom const & t)
{
- //lyxerr << "LCursor::insert MathAtom: " << endl;
+ //lyxerr << "LCursor::insert MathAtom '" << t << "'" << endl;
macroModeClose();
lyx::cap::selClearOrDel(*this);
plainInsert(t);
- lyxerr << "LCursor::insert MathAtom: cur:\n" << *this << endl;
}
DocIterator save = *this;
if (goUpDown(true))
return true;
- setCursor(save, false);
+ setCursor(save);
autocorrect() = false;
return selection();
}
DocIterator save = *this;
if (goUpDown(false))
return true;
- setCursor(save, false);
+ setCursor(save);
autocorrect() = false;
return selection();
}
string const name = s.substr(1);
// prevent entering of recursive macros
+ // FIXME: this is only a weak attempt... only prevents immediate
+ // recursion
InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
if (macro && macro->getInsetName() == name)
lyxerr << "can't enter recursive macro" << endl;
- niceInsert(createMathInset(name));
+ plainInsert(createMathInset(name));
}
bool LCursor::inMacroMode() const
{
- if (!pos() != 0)
+ if (pos() == 0)
return false;
MathUnknownInset const * p = prevAtom()->asUnknownInset();
return p && !p->final();
// matters. So fiddle around with it only if you think you know
// what you are doing!
- int xo = 0;
+ int xo = 0;
int yo = 0;
getPos(xo, yo);
// yhigh = yo - 4;
//else
// ylow = yo + 4;
- //if (bruteFind(xo, yo, xlow, xhigh, ylow, yhigh)) {
+ //if (bruteFind(*this, xo, yo, xlow, xhigh, ylow, yhigh)) {
// lyxerr << "updown: handled by brute find in the same cell" << endl;
// return true;
//}
if (inset().idxUpDown(*this, up)) {
// try to find best position within this inset
if (!selection())
- bruteFind2(xo, yo);
+ setCursor(bruteFind2(*this, xo, yo));
return true;
}
if (!popLeft()) {
int ylow = up ? 0 : yo + 1;
int yhigh = up ? yo - 1 : bv().workHeight();
- return bruteFind(xo, yo, 0, bv().workWidth(), ylow, yhigh);
+ return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
}
// any improvement so far?
if (up ? ynew < yo : ynew > yo)
return true;
}
-}
-
-bool LCursor::bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhigh)
-{
- BOOST_ASSERT(!empty());
- par_type beg, end;
- CursorSlice bottom = operator[](0);
- LyXText * text = bottom.text();
- BOOST_ASSERT(text);
- getParsInRange(text->paragraphs(), ylow, yhigh, beg, end);
-
- DocIterator it = doc_iterator_begin(bv().buffer()->inset());
- DocIterator et = doc_iterator_end(bv().buffer()->inset());
- //lyxerr << "x: " << x << " y: " << y << endl;
- //lyxerr << "xlow: " << xlow << " ylow: " << ylow << endl;
- //lyxerr << "xhigh: " << xhigh << " yhigh: " << yhigh << endl;
-
- it.par() = beg;
- //et.par() = text->parOffset(end);
-
- double best_dist = 10e10;
- DocIterator best_cursor = it;
-
- for ( ; it != et; it.forwardPos()) {
- // avoid invalid nesting when selecting
- if (!selection() || positionable(it, anchor_)) {
- int xo = 0, yo = 0;
- LCursor cur = *this;
- cur.setCursor(it, false);
- cur.inset().getCursorPos(cur, xo, yo);
- 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;
- // '<=' 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_dist < 1e10)
- setCursor(best_cursor, false);
- return best_dist < 1e10;
-}
-
-
-void LCursor::bruteFind2(int x, int y)
-{
- double best_dist = 1e10;
-
- DocIterator it = *this;
- it.back().pos() = 0;
- DocIterator et = *this;
- et.back().pos() = et.back().asMathInset()->cell(et.back().idx()).size();
- for (int i = 0; ; ++i) {
- int xo, yo;
- LCursor cur = *this;
- cur.setCursor(it, false);
- cur.inset().getCursorPos(cur, 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'
- lyxerr << "i: " << i << " d: " << d << " best: " << best_dist << endl;
- if (d <= best_dist) {
- best_dist = d;
- setCursor(it, false);
- }
- if (it == et)
- break;
- it.forwardPos();
- }
+ // we should not come here.
+ BOOST_ASSERT(false);
}
void LCursor::handleFont(string const & font)
{
- lyxerr << "LCursor::handleFont: " << font << endl;
+ lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl;
string safe;
if (selection()) {
macroModeClose();
ParagraphList & pars = text()->paragraphs();
// should be const ...
- par_type startpit = selBegin().par();
- par_type endpit = selEnd().par();
+ pit_type startpit = selBegin().pit();
+ pit_type endpit = selEnd().pit();
size_t const startpos = selBegin().pos();
size_t const endpos = selEnd().pos();
asString(buffer, startpos, pars[startpit].size(), label) + "\n\n";
// The paragraphs in between (if any)
- for (par_type pit = startpit + 1; pit != endpit; ++pit) {
+ for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
Paragraph & par = pars[pit];
result += par.asString(buffer, 0, par.size(), label) + "\n\n";
}
break;
CursorSlice const & sl = operator[](s);
LyXText & text = *sl.text();
- LyXFont font = text.getPar(sl.par()).getFont(
- bv().buffer()->params(), sl.pos(), outerFont(sl.par(), text.paragraphs()));
+ LyXFont font = text.getPar(sl.pit()).getFont(
+ bv().buffer()->params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
return font.language()->encoding();
}
}
+void LCursor::needsUpdate()
+{
+ disp_.update(true);
+}
+
+
void LCursor::noUpdate()
{
disp_.update(false);