X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=a9fd17e47b3a70f975964267243c0d236f251b4f;hb=530749439472bddf13d9f4ee74ee6184ef76e3f9;hp=0be9a3263237c7cd15038ba500432653a3c429d5;hpb=2aa786c65225add27f3157a6e77faf728405e9ef;p=lyx.git diff --git a/src/cursor.C b/src/cursor.C index 0be9a32632..a9fd17e47b 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -50,6 +50,7 @@ #include #include +#include using lyx::pit_type; @@ -68,11 +69,11 @@ namespace { positionable(DocIterator const & cursor, DocIterator const & anchor) { // avoid deeper nested insets when selecting - if (cursor.size() > anchor.size()) + if (cursor.depth() > anchor.depth()) return false; // anchor might be deeper, should have same path then - for (size_t i = 0; i < cursor.size(); ++i) + for (size_t i = 0; i < cursor.depth(); ++i) if (&cursor[i].inset() != &anchor[i].inset()) return false; @@ -90,11 +91,12 @@ namespace { DocIterator result; DocIterator it = c; - it.back().pos() = 0; + it.top().pos() = 0; DocIterator et = c; - et.back().pos() = et.back().asMathInset()->cell(et.back().idx()).size(); + et.top().pos() = et.top().asMathInset()->cell(et.top().idx()).size(); for (int i = 0; ; ++i) { - int xo, yo; + int xo; + int yo; LCursor cur = c; cur.setCursor(it); cur.inset().getCursorPos(cur.top(), xo, yo); @@ -121,8 +123,6 @@ namespace { { BOOST_ASSERT(!cursor.empty()); CursorSlice bottom = cursor[0]; - LyXText * text = bottom.text(); - BOOST_ASSERT(text); DocIterator it = doc_iterator_begin(bottom.inset()); DocIterator const et = doc_iterator_end(bottom.inset()); @@ -160,7 +160,6 @@ namespace { return false; } - } // namespace anon @@ -192,15 +191,19 @@ void LCursor::setCursor(DocIterator const & cur) void LCursor::dispatch(FuncRequest const & cmd0) { - lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: " << cmd0 << endl << *this << endl; + lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION + << " cmd: " << cmd0 << '\n' + << *this << endl; if (empty()) return; + fixIfBroken(); FuncRequest cmd = cmd0; LCursor safe = *this; - for (; size(); pop()) { - lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: " << cmd0 << endl << *this << endl; + for (; depth(); pop()) { + lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: " + << cmd0 << endl << *this << endl; BOOST_ASSERT(pos() <= lastpos()); BOOST_ASSERT(idx() <= lastidx()); BOOST_ASSERT(pit() <= lastpit()); @@ -230,45 +233,6 @@ DispatchResult LCursor::result() const } -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 (pit() > lastpit()) { - lyxerr << "wrong par " << pit() << ", max is " << lastpit() - << ". Trying to correct this." << endl; - pit() = lastpit(); - } - 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_); @@ -286,7 +250,7 @@ Buffer & LCursor::buffer() const void LCursor::pop() { - BOOST_ASSERT(size() >= 1); + BOOST_ASSERT(depth() >= 1); pop_back(); } @@ -334,7 +298,7 @@ bool LCursor::popRight() int LCursor::currentMode() { BOOST_ASSERT(!empty()); - for (int i = size() - 1; i >= 0; --i) { + for (int i = depth() - 1; i >= 0; --i) { int res = operator[](i).inset().currentMode(); if (res != InsetBase::UNDECIDED_MODE) return res; @@ -343,25 +307,6 @@ int LCursor::currentMode() } -void LCursor::getDim(int & asc, int & des) const -{ - if (inMathed()) { - BOOST_ASSERT(inset().asMathInset()); - //inset().asMathInset()->getCursorDim(asc, des); - asc = 10; - des = 2; - } else if (inTexted()) { - 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; - des = 10; - } -} - - void LCursor::getPos(int & x, int & y) const { Point p = bv_funcs::getPos(*this); @@ -403,9 +348,9 @@ bool LCursor::posRight() CursorSlice LCursor::anchor() const { - BOOST_ASSERT(anchor_.size() >= size()); - CursorSlice normal = anchor_[size() - 1]; - if (size() < anchor_.size() && back() <= normal) { + BOOST_ASSERT(anchor_.depth() >= depth()); + CursorSlice normal = anchor_[depth() - 1]; + if (depth() < anchor_.depth() && top() <= normal) { // anchor is behind cursor -> move anchor behind the inset ++normal.pos(); } @@ -416,16 +361,16 @@ CursorSlice LCursor::anchor() const CursorSlice LCursor::selBegin() const { if (!selection()) - return back(); - return anchor() < back() ? anchor() : back(); + return top(); + return anchor() < top() ? anchor() : top(); } CursorSlice LCursor::selEnd() const { if (!selection()) - return back(); - return anchor() > back() ? anchor() : back(); + return top(); + return anchor() > top() ? anchor() : top(); } @@ -433,7 +378,7 @@ DocIterator LCursor::selectionBegin() const { if (!selection()) return *this; - return anchor() < back() ? anchor_ : *this; + return anchor() < top() ? anchor_ : *this; } @@ -441,7 +386,7 @@ DocIterator LCursor::selectionEnd() const { if (!selection()) return *this; - return anchor() > back() ? anchor_ : *this; + return anchor() > top() ? anchor_ : *this; } @@ -521,15 +466,15 @@ void LCursor::selHandle(bool sel) std::ostream & operator<<(std::ostream & os, LCursor const & cur) { os << "\n cursor: | anchor:\n"; - for (size_t i = 0, n = cur.size(); i != n; ++i) { - os << " " << cur.operator[](i) << " | "; - if (i < cur.anchor_.size()) + for (size_t i = 0, n = cur.depth(); i != n; ++i) { + os << " " << cur[i] << " | "; + if (i < cur.anchor_.depth()) os << cur.anchor_[i]; else os << "-------------------------------"; os << "\n"; } - for (size_t i = cur.size(), n = cur.anchor_.size(); i < n; ++i) { + for (size_t i = cur.depth(), n = cur.anchor_.depth(); i < n; ++i) { os << "------------------------------- | " << cur.anchor_[i] << "\n"; } os << " selection: " << cur.selection_ @@ -581,7 +526,7 @@ bool LCursor::openable(MathAtom const & t) const return true; // we can't move into anything new during selection - if (depth() >= anchor_.size()) + if (depth() >= anchor_.depth()) return false; if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset())) return false; @@ -676,7 +621,7 @@ void LCursor::niceInsert(string const & t) void LCursor::niceInsert(MathAtom const & t) { macroModeClose(); - string safe = lyx::cap::grabAndEraseSelection(*this); + string const safe = lyx::cap::grabAndEraseSelection(*this); plainInsert(t); // enter the new inset and move the contents of the selection if possible if (t->isActive()) { @@ -808,7 +753,7 @@ void LCursor::macroModeClose() return; MathUnknownInset * p = activeMacro(); p->finalize(); - string s = p->name(); + string const s = p->name(); --pos(); cell().erase(pos()); @@ -859,10 +804,11 @@ int LCursor::targetX() const void LCursor::setTargetX() { - //for now this is good enough. A better solution would be to - //avoid this rebreak by setting cursorX only after drawing + // 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; + int x; + int y; getPos(x, y); x_target_ = x; } @@ -990,7 +936,7 @@ bool LCursor::goUpDown(bool up) //} // try to find an inset that knows better then we - while (1) { + while (true) { //lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl; // ask inset first if (inset().idxUpDown(*this, up)) { @@ -1009,7 +955,8 @@ bool LCursor::goUpDown(bool up) } // any improvement so far? - int xnew, ynew; + int xnew; + int ynew; getPos(xnew, ynew); if (up ? ynew < yo : ynew > yo) return true; @@ -1117,7 +1064,7 @@ string LCursor::currentState() } if (inTexted()) - return text()->currentState(*this); + return text()->currentState(*this); return string(); } @@ -1138,11 +1085,11 @@ Encoding const * LCursor::getEncoding() const int s = 0; // go up until first non-0 text is hit // (innermost text is 0 in mathed) - for (s = size() - 1; s >= 0; --s) + for (s = depth() - 1; s >= 0; --s) if (operator[](s).text()) break; CursorSlice const & sl = operator[](s); - LyXText & text = *sl.text(); + LyXText const & text = *sl.text(); LyXFont font = text.getPar(sl.pit()).getFont( bv().buffer()->params(), sl.pos(), outerFont(sl.pit(), text.paragraphs())); return font.language()->encoding(); @@ -1171,3 +1118,61 @@ void LCursor::noUpdate() { disp_.update(false); } + + +LyXFont LCursor::getFont() const +{ + // HACK. far from being perfect... + int s = 0; + // go up until first non-0 text is hit + // (innermost text is 0 in mathed) + for (s = depth() - 1; s >= 0; --s) + if (operator[](s).text()) + break; + CursorSlice const & sl = operator[](s); + LyXText const & text = *sl.text(); + LyXFont font = text.getPar(sl.pit()).getFont( + bv().buffer()->params(), + sl.pos(), + outerFont(sl.pit(), text.paragraphs())); + + return font; +} + + +void LCursor::fixIfBroken() +{ + // find out last good level + LCursor copy = *this; + size_t newdepth = depth(); + while (!copy.empty()) { + if (copy.idx() > copy.lastidx()) { + lyxerr << "wrong idx " << copy.idx() + << ", max is " << copy.lastidx() + << " at level " << copy.depth() + << ". Trying to correct this." << endl; + newdepth = copy.depth() - 1; + } + else if (copy.pit() > copy.lastpit()) { + lyxerr << "wrong pit " << copy.pit() + << ", max is " << copy.lastpit() + << " at level " << copy.depth() + << ". Trying to correct this." << endl; + newdepth = copy.depth() - 1; + } + else if (copy.pos() > copy.lastpos()) { + lyxerr << "wrong pos " << copy.pos() + << ", max is " << copy.lastpos() + << " at level " << copy.depth() + << ". Trying to correct this." << endl; + newdepth = copy.depth() - 1; + } + copy.pop(); + } + // shrink cursor to a size where everything is valid, possibly + // leaving insets + while (depth() > newdepth) { + pop(); + lyxerr << "correcting cursor to level " << depth() << endl; + } +}