X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.C;h=41f94771b80c9072ec752e69865799a1b6276b64;hb=b9963e1a57135c3e2ab128a9ec4300f0e4886992;hp=0576f55b9680cdbc2a73aa8d1c3d1d87d8751284;hpb=46756fd9e4087fd30d9de504684d83803cd4b4c5;p=lyx.git diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index 0576f55b96..41f94771b8 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. */ @@ -33,9 +34,10 @@ #include "frontends/Alert.h" #include "frontends/LyXView.h" +#include "insets/insetcommand.h" #include "insets/insettext.h" -#include "support/tostr.h" +#include "support/convert.h" #include @@ -44,6 +46,7 @@ using lyx::support::bformat; using std::istringstream; using std::ostringstream; using std::string; +using std::vector; namespace bv_funcs { @@ -67,7 +70,7 @@ bool font2string(LyXFont const & font, bool const toggle, string & data) << "number " << font.number() << '\n' << "color " << font.color() << '\n' << "language " << lang << '\n' - << "toggleall " << tostr(toggle); + << "toggleall " << convert(toggle); data = os.str(); return true; } @@ -150,43 +153,66 @@ 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(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; + //FIXME: the check for asMathInset() shouldn't be necessary + // but math insets do not return a sensible editable() state yet. + if (sl.inset().asMathInset() + || sl.inset().editable() == InsetBase::HIGHLY_EDITABLE) + sl.inset().cursorPos(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) +#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 = par.pos2row(pos); + } else + rend = par.pos2row(sl.pos()); +#else + size_t rend = par.pos2row(sl.pos()); +#endif + for (size_t rit = 0; 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); + y += par.rows()[rend].ascent(); + x += dit.bottom().text()->cursorX(dit.bottom(), boundary && dit.depth() == 1); + // The following correction should not be there at all. + // The cursor looks much better with the -1, though. + --x; + return Point(x, y); } -Point getPos(DocIterator const & dit) +Point getPos(DocIterator const & dit, bool boundary) { CursorSlice const & bot = dit.bottom(); - CoordCache::InnerParPosCache & cache = theCoords.pars_[bot.text()]; - CoordCache::InnerParPosCache::iterator it = cache.find(bot.pit()); + CoordCache::InnerParPosCache const & cache = + theCoords.getParPos().find(bot.text())->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(dit, boundary); // offset from outer paragraph p.y_ += it->second.y_; return p; } @@ -195,8 +221,8 @@ Point getPos(DocIterator const & dit) // this could be used elsewhere as well? CurStatus status(BufferView const * bv, DocIterator const & dit) { - CoordCache::InnerParPosCache & cache = theCoords.pars_[dit.bottom().text()]; - + CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(dit.bottom().text())->second; + if (cache.find(dit.bottom().pit()) != cache.end()) return CUR_INSIDE; else if (dit.bottom().pit() < bv->anchor_ref()) @@ -205,5 +231,86 @@ 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 (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