#include "BufferView.h"
#include "buffer.h"
#include "cursor.h"
+#include "coordcache.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "dispatchresult.h"
#include "support/limited_stack.h"
#include "frontends/LyXView.h"
+#include "frontends/font_metrics.h"
#include <boost/assert.hpp>
#include <boost/bind.hpp>
// Find position closest to (x, y) in cell given by iter.
+ // Used only in mathed
DocIterator bruteFind2(LCursor const & c, int x, int y)
{
- double best_dist = 1e10;
+ double best_dist = std::numeric_limits<double>::max();
DocIterator result;
int xo, yo;
LCursor cur = c;
cur.setCursor(it);
- cur.inset().getCursorPos(cur, xo, yo);
+ cur.inset().getCursorPos(cur.top(), 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;
+ lyxerr[Debug::DEBUG] << "i: " << i << " d: " << d
+ << " best: " << best_dist << endl;
if (d <= best_dist) {
best_dist = d;
result = it;
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;
+ DocIterator it = doc_iterator_begin(bottom.inset());
+ DocIterator const et = doc_iterator_end(bottom.inset());
- it.pit() = beg;
- //et.pit() = text->parOffset(end);
-
- double best_dist = 10e10;
- DocIterator best_cursor = it;
+ double best_dist = std::numeric_limits<double>::max();;
+ DocIterator best_cursor = et;
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 (bv_funcs::status(&cursor.bv(), it) == bv_funcs::CUR_INSIDE
+ && (!cursor.selection() || positionable(it, cursor.anchor_))) {
+ Point p = bv_funcs::getPos(it);
+ 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;
}
//lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
- if (best_dist < 1e10)
+ if (best_cursor != et) {
cursor.setCursor(best_cursor);
- return best_dist < 1e10;
+ return true;
+ }
+
+ return false;
}
} // namespace anon
+// be careful: this is called from the bv's constructor, too, so
+// bv functions are not yet available!
LCursor::LCursor(BufferView & bv)
: DocIterator(), bv_(&bv), anchor_(), x_target_(-1),
selection_(false), mark_(false)
BOOST_ASSERT(inset().asMathInset());
//inset().asMathInset()->getCursorDim(asc, des);
asc = 10;
- des = 10;
+ des = 2;
} else if (inTexted()) {
- Row const & row = textRow();
- asc = row.baseline();
- des = row.height() - asc;
+ LyXFont const & realfont = text()->real_current_font;
+ asc = font_metrics::maxAscent(realfont);
+ des = font_metrics::maxDescent(realfont);
} else {
lyxerr << "should this happen?" << endl;
asc = 10;
void LCursor::getPos(int & x, int & y) const
{
- x = 0;
- y = 0;
- if (!empty())
- inset().getCursorPos(*this, x, y);
+ Point p = bv_funcs::getPos(*this);
+ x = p.x_;
+ y = p.y_;
}
}
+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, y;
+ getPos(x, y);
+ x_target_ = x;
+}
+
+
bool LCursor::inMacroMode() const
{
if (pos() == 0)
}
}
- // try current cell for e.g. text insets
- if (inset().idxUpDown2(*this, up))
- return true;
-
//xarray().boundingBox(xlow, xhigh, ylow, yhigh);
//if (up)
// yhigh = yo - 4;