X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.C;h=547f94962c497187c2a68182ff851aa915e92848;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=e83ce1ae85ae08074e1c7eaf534c43eb0a03c7c2;hpb=e22c5f4d97b53a5d2adcbf7bbc7ba2dd40ef40de;p=lyx.git diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index e83ce1ae85..547f94962c 100644 --- a/src/bufferview_funcs.C +++ b/src/bufferview_funcs.C @@ -7,6 +7,7 @@ * \author Jean-Marc Lasgouttes * \author John Levon * \author Angus Leeming + * \author Juergen Vigna * * Full author contact details are available in file CREDITS. */ @@ -31,19 +32,24 @@ #include "pariterator.h" #include "frontends/Alert.h" -#include "frontends/LyXView.h" +#include "insets/insetcommand.h" #include "insets/insettext.h" #include "support/convert.h" #include -using lyx::support::bformat; + +namespace lyx { + +using support::bformat; using std::istringstream; using std::ostringstream; using std::string; +using std::vector; +using std::find; namespace bv_funcs { @@ -150,52 +156,77 @@ bool string2font(string const & data, LyXFont & font, bool & toggle) // the next two should probably go elsewhere // this give the position relative to (0, baseline) of outermost // paragraph -Point coordOffset(DocIterator const & dit) +Point coordOffset(BufferView const & bv, DocIterator const & dit, + bool boundary) { int x = 0; int y = 0; // Contribution of nested insets - for (size_t i = 1; i != dit.size(); ++i) { + for (size_t i = 1; i != dit.depth(); ++i) { CursorSlice const & sl = dit[i]; - int xx = 0, yy = 0; - sl.inset().getCursorPos(sl, xx, yy); + int xx = 0; + int yy = 0; + sl.inset().cursorPos(bv, sl, boundary && ((i+1) == dit.depth()), xx, yy); x += xx; y += yy; - //lyxerr << "LCursor::getPos, i: " << i << " x: " << xx << " y: " << y << endl; + //lyxerr << "LCursor::getPos, i: " + // << i << " x: " << xx << " y: " << y << endl; } // Add contribution of initial rows of outermost paragraph CursorSlice const & sl = dit[0]; - Paragraph const & par = sl.text()->getPar(sl.pit()); - y -= par.rows()[0].ascent(); - for (size_t rit = 0, rend = par.pos2row(sl.pos()); rit != rend; ++rit) - y += par.rows()[rit].height(); - y += par.rows()[par.pos2row(sl.pos())].ascent(); - x += dit.bottom().text()->cursorX(dit.bottom()); - return Point(x,y); + ParagraphMetrics const & pm = bv.parMetrics(sl.text(), sl.pit()); + BOOST_ASSERT(!pm.rows().empty()); + y -= pm.rows()[0].ascent(); +#if 1 + size_t rend; + if (sl.pos() > 0 && dit.depth() == 1) { + int pos = sl.pos(); + if (pos && boundary) + --pos; +// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl; + rend = pm.pos2row(pos); + } else + rend = pm.pos2row(sl.pos()); +#else + size_t rend = pm.pos2row(sl.pos()); +#endif + for (size_t rit = 0; rit != rend; ++rit) + y += pm.rows()[rit].height(); + y += pm.rows()[rend].ascent(); + x += dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1); + + return Point(x, y); } -Point getPos(DocIterator const & dit) +Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary) { CursorSlice const & bot = dit.bottom(); - CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(bot.text())->second; + CoordCache::ParPosCache::const_iterator cache_it = + bv.coordCache().getParPos().find(bot.text()); + if (cache_it == bv.coordCache().getParPos().end()) + return Point(-1, -1); + + CoordCache::InnerParPosCache const & cache = cache_it->second; CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit()); if (it == cache.end()) { //lyxerr << "cursor out of view" << std::endl; - return Point(-1,-1); + return Point(-1, -1); } - Point p = coordOffset(dit); // offset from outer paragraph + Point p = coordOffset(bv, dit, boundary); // offset from outer paragraph p.y_ += it->second.y_; return p; } // this could be used elsewhere as well? +// FIXME: This does not work within mathed! CurStatus status(BufferView const * bv, DocIterator const & dit) { - CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(dit.bottom().text())->second; + CoordCache::InnerParPosCache const & cache = + bv->coordCache().getParPos().find(dit.bottom().text())->second; if (cache.find(dit.bottom().pit()) != cache.end()) return CUR_INSIDE; @@ -205,5 +236,91 @@ CurStatus status(BufferView const * bv, DocIterator const & dit) return CUR_BELOW; } +namespace { + +bool findNextInset(DocIterator & dit, + vector const & codes, + string const & contents) +{ + DocIterator tmpdit = dit; + + while (tmpdit) { + InsetBase const * inset = tmpdit.nextInset(); + if (inset + && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end() + && (contents.empty() || + static_cast(inset)->getContents() == contents)) { + dit = tmpdit; + return true; + } + tmpdit.forwardInset(); + } + + return false; +} + +} // namespace anon + + +bool findInset(DocIterator & dit, vector const & codes, + bool same_content) +{ + string contents; + DocIterator tmpdit = dit; + tmpdit.forwardInset(); + if (!tmpdit) + return false; + + if (same_content) { + InsetBase const * inset = tmpdit.nextInset(); + if (inset + && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) { + contents = static_cast(inset)->getContents(); + } + } + + if (!findNextInset(tmpdit, codes, contents)) { + if (dit.depth() != 1 || dit.pit() != 0 || dit.pos() != 0) { + tmpdit = doc_iterator_begin(tmpdit.bottom().inset()); + if (!findNextInset(tmpdit, codes, contents)) { + return false; + } + } else + return false; + } + + dit = tmpdit; + return true; +} + + +void findInset(DocIterator & dit, InsetBase_code code, bool same_content) +{ + findInset(dit, vector(1, code), same_content); +} + + +void gotoInset(BufferView * bv, vector const & codes, + bool same_content) +{ + LCursor tmpcur = bv->cursor(); + if (!findInset(tmpcur, codes, same_content)) { + bv->cursor().message(_("No more insets")); + return; + } + + tmpcur.clearSelection(); + bv->setCursor(tmpcur); +} + + +void gotoInset(BufferView * bv, InsetBase_code code, bool same_content) +{ + gotoInset(bv, vector(1, code), same_content); +} + } // namespace bv_funcs + + +} // namespace lyx