#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>
#include <boost/current_function.hpp>
#include <sstream>
-using lyx::par_type;
+using lyx::pit_type;
using std::string;
using std::vector;
namespace {
- bool positionable
- (DocIterator const & cursor, DocIterator const & anchor)
+ bool
+ positionable(DocIterator const & cursor, DocIterator const & anchor)
{
// avoid deeper nested insets when selecting
if (cursor.size() > anchor.size())
// 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());
- par_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.par() = beg;
- //et.par() = 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)
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.
}
-bool LCursor::getStatus(FuncRequest const & cmd, FuncStatus & status)
-{
- // This is, of course, a mess. Better create a new doc iterator and use
- // this in Inset::getStatus. This might require an additional
- // BufferView * arg, though (which should be avoided)
- LCursor safe = *this;
- bool res = false;
- for ( ; size(); pop()) {
- //lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
- if (idx() > lastidx()) {
- lyxerr << "wrong idx " << idx() << ", max is " << lastidx()
- << ". Trying to correct this." << endl;
- idx() = lastidx();
- }
- if (par() > lastpar()) {
- lyxerr << "wrong par " << par() << ", max is " << lastpar()
- << ". Trying to correct this." << endl;
- par() = lastpar();
- }
- 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
- // request or not. The result of this decision is put into
- // the 'status' parameter.
- if (inset().getStatus(*this, cmd, status)) {
- res = true;
- break;
- }
- }
- operator=(safe);
- return res;
-}
-
-
BufferView & LCursor::bv() const
{
BOOST_ASSERT(bv_);
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_;
}
#ifdef WITH_WARNINGS
#warning doesnt look ok
#endif
- if (par() == anchor().par() && pos() == anchor().pos())
+ if (pit() == anchor().pit() && pos() == anchor().pos())
selection() = false;
}
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::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;
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();
}
projects / lyx.git / blobdiff