X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferview_funcs.C;h=41f94771b80c9072ec752e69865799a1b6276b64;hb=b9963e1a57135c3e2ab128a9ec4300f0e4886992;hp=13383258d6b27477f32bcc11a06e7c31a851ce84;hpb=25bafa277251eaf01e3068921442b1584ce77975;p=lyx.git diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index 13383258d6..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. */ @@ -20,6 +21,7 @@ #include "bufferparams.h" #include "BufferView.h" #include "cursor.h" +#include "coordcache.h" #include "gettext.h" #include "language.h" #include "LColor.h" @@ -27,32 +29,31 @@ #include "lyxrow.h" #include "paragraph.h" #include "ParagraphParameters.h" -#include "PosIterator.h" -#include "iterators.h" +#include "pariterator.h" #include "frontends/Alert.h" #include "frontends/LyXView.h" +#include "insets/insetcommand.h" #include "insets/insettext.h" -#include "mathed/math_cursor.h" +#include "support/convert.h" -#include "support/tostr.h" - -#include "support/std_sstream.h" +#include using lyx::support::bformat; using std::istringstream; using std::ostringstream; using std::string; +using std::vector; namespace bv_funcs { // Set data using font and toggle // If successful, returns true -bool font2string(LyXFont const & font, bool toggle, string & data) +bool font2string(LyXFont const & font, bool const toggle, string & data) { string lang = "ignore"; if (font.language()) @@ -69,7 +70,7 @@ bool font2string(LyXFont const & font, bool 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; } @@ -149,163 +150,166 @@ bool string2font(string const & data, LyXFont & font, bool & toggle) } -bool changeDepthAllowed(BufferView * bv, LyXText * text, DEPTH_CHANGE type) +// the next two should probably go elsewhere +// this give the position relative to (0, baseline) of outermost +// paragraph +Point coordOffset(DocIterator const & dit, bool boundary) { - if (!bv->available() || !text) - return false; + int x = 0; + int y = 0; + + // Contribution of nested insets + for (size_t i = 1; i != dit.depth(); ++i) { + CursorSlice const & sl = dit[i]; + 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; + } - return text->changeDepthAllowed(type); + // 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(); +#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()[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); } -void changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type) +Point getPos(DocIterator const & dit, bool boundary) { - if (!bv->available() || !text) - return; - text->changeDepth(type); + CursorSlice const & bot = dit.bottom(); + 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); + } + Point p = coordOffset(dit, boundary); // offset from outer paragraph + p.y_ += it->second.y_; + return p; } -// Returns the current font and depth as a message. -string const currentState(BufferView * bv) +// this could be used elsewhere as well? +CurStatus status(BufferView const * bv, DocIterator const & dit) { - if (!bv->available()) - return string(); - - if (mathcursor) - return mathcursor->info(); - - ostringstream state; - - LyXText * text = bv->getLyXText(); - Buffer * buffer = bv->buffer(); - CursorSlice const & c = text->cursor(); - - bool const show_change = buffer->params().tracking_changes - && text->cursor().pos() != text->cursorPar()->size() - && text->cursorPar()->lookupChange(c.pos()) != Change::UNCHANGED; - - if (show_change) { - Change change = text->cursorPar()->lookupChangeFull(c.pos()); - Author const & a = bv->buffer()->params().authors().get(change.author); - state << _("Change: ") << a.name(); - if (!a.email().empty()) - state << " (" << a.email() << ")"; - if (change.changetime) - state << _(" at ") << ctime(&change.changetime); - state << " : "; - } - - // I think we should only show changes from the default - // font. (Asger) - LyXFont font = text->real_current_font; - font.reduce(buffer->params().getLyXTextClass().defaultfont()); - - // avoid _(...) re-entrance problem - string const s = font.stateText(&buffer->params()); - state << bformat(_("Font: %1$s"), s); - - // state << bformat(_("Font: %1$s"), font.stateText(&buffer->params)); + CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(dit.bottom().text())->second; - // The paragraph depth - int depth = text->getDepth(); - if (depth > 0) - state << bformat(_(", Depth: %1$s"), tostr(depth)); + if (cache.find(dit.bottom().pit()) != cache.end()) + return CUR_INSIDE; + else if (dit.bottom().pit() < bv->anchor_ref()) + return CUR_ABOVE; + else + return CUR_BELOW; +} - // The paragraph spacing, but only if different from - // buffer spacing. - if (!text->cursorPar()->params().spacing().isDefault()) { - Spacing::Space cur_space = - text->cursorPar()->params().spacing().getSpace(); - state << _(", Spacing: "); +namespace { - switch (cur_space) { - case Spacing::Single: - state << _("Single"); - break; - case Spacing::Onehalf: - state << _("OneHalf"); - break; - case Spacing::Double: - state << _("Double"); - break; - case Spacing::Other: - state << _("Other (") - << text->cursorPar()->params().spacing().getValue() - << ')'; - break; - case Spacing::Default: - // should never happen, do nothing - break; +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(); } -#ifdef DEVEL_VERSION - ParagraphList::iterator pit = text->cursorPar(); - state << _(", Paragraph: ") << pit->id(); - state << _(", Position: ") << text->cursor().pos(); - RowList::iterator rit = pit->getRow(text->cursor().pos()); - state << bformat(_(", Row b:%1$d e:%2$d"), rit->pos(), rit->endpos()); - state << _(", Inset: "); - InsetOld * inset = pit->inInset(); - if (inset) - state << inset << " owner: " << inset->owner(); - else - state << -1; -#endif - return state.str(); + + return false; } +} // namespace anon -// deletes a selection during an insertion -void replaceSelection(LyXText * text) +bool findInset(DocIterator & dit, vector const & codes, + bool same_content) { - if (text->selection.set()) { - text->cutSelection(true, false); - text->bv()->update(); + 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; +} -/* -if the fitCursor call refers to some point in never-explored-land, then we -don't have y information in insets there, then we cannot even do an update -to get it (because we need the y infomation for setting top_y first). So -this is solved in put_selection_at with: -- setting top_y to the y of the outerPar (that has good info) -- calling update -- calling cursor().updatePos() -- then call fitCursor() +void findInset(DocIterator & dit, InsetBase_code code, bool same_content) +{ + findInset(dit, vector(1, code), same_content); +} -Ab. -*/ -void put_selection_at(BufferView * bv, PosIterator const & cur, - int length, bool backwards) +void gotoInset(BufferView * bv, vector const & codes, + bool same_content) { - ParIterator par(cur); - - bv->getLyXText()->clearSelection(); - - LyXText * text = par.text(*bv->buffer()); - par.lockPath(bv); - // hack for the chicken and egg problem - if (par.inset()) - bv->top_y(par.outerPar()->y); - bv->update(); - text->setCursor(cur.pit(), cur.pos()); - bv->fullCursor().updatePos(); - - if (length) { - text->setSelectionRange(length); - text->setSelection(); - if (backwards) - std::swap(text->cursor(), text->anchor()); + LCursor tmpcur = bv->cursor(); + if (!findInset(tmpcur, codes, same_content)) { + bv->cursor().message(_("No more insets")); + return; } - bv->fitCursor(); - bv->update(); + tmpcur.clearSelection(); + bv->setCursor(tmpcur); +} + + +void gotoInset(BufferView * bv, InsetBase_code code, bool same_content) +{ + gotoInset(bv, vector(1, code), same_content); }