X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=0017e1ae149576b29cdc42ccf9475156691dc127;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=d8362e21d9333fe0c80554d7f301dafb55fd9405;hpb=5ebc733ff3ec044a93f8ae7a7aaea22ea68224df;p=lyx.git diff --git a/src/Cursor.cpp b/src/Cursor.cpp index d8362e21d9..0017e1ae14 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -26,6 +26,7 @@ #include "FuncCode.h" #include "FuncRequest.h" #include "Language.h" +#include "LyXAction.h" #include "LyXFunc.h" // only for setMessage() #include "LyXRC.h" #include "Paragraph.h" @@ -253,8 +254,8 @@ bool bruteFind3(Cursor & cur, int x, int y, bool up) Cursor::Cursor(BufferView & bv) : DocIterator(&bv.buffer()), bv_(&bv), anchor_(), x_target_(-1), textTargetOffset_(0), - selection_(false), mark_(false), logicalpos_(false), - current_font(inherit_font) + selection_(false), mark_(false), word_selection_(false), + logicalpos_(false), current_font(inherit_font) {} @@ -277,6 +278,43 @@ void Cursor::setCursor(DocIterator const & cur) } +bool Cursor::getStatus(FuncRequest const & cmd, FuncStatus & status) const +{ + Cursor cur = *this; + + // Try to fix cursor in case it is broken. + cur.fixIfBroken(); + + // Is this a function that acts on inset at point? + Inset * inset = cur.nextInset(); + if (lyxaction.funcHasFlag(cmd.action, LyXAction::AtPoint) + && inset && inset->getStatus(cur, cmd, status)) + return true; + + // 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) + //Cursor safe = *this; + bool res = false; + for ( ; cur.depth(); cur.pop()) { + //lyxerr << "\nCursor::getStatus: cmd: " << cmd << endl << *this << endl; + LASSERT(cur.idx() <= cur.lastidx(), /**/); + LASSERT(cur.pit() <= cur.lastpit(), /**/); + LASSERT(cur.pos() <= cur.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 (cur.inset().getStatus(cur, cmd, status)) { + res = true; + break; + } + } + return res; +} + + void Cursor::dispatch(FuncRequest const & cmd0) { LYXERR(Debug::DEBUG, "cmd: " << cmd0 << '\n' << *this); @@ -289,6 +327,19 @@ void Cursor::dispatch(FuncRequest const & cmd0) buffer()->undo().beginUndoGroup(); + // Is this a function that acts on inset at point? + if (lyxaction.funcHasFlag(cmd.action, LyXAction::AtPoint) + && nextInset()) { + result().dispatched(true); + result().update(Update::FitCursor | Update::Force); + FuncRequest tmpcmd = cmd; + LYXERR(Debug::DEBUG, "Cursor::dispatch: (AtPoint) cmd: " + << cmd0 << endl << *this); + nextInset()->dispatch(*this, tmpcmd); + if (result().dispatched()) + return; + } + // store some values to be used inside of the handlers beforeDispatchCursor_ = *this; for (; depth(); pop(), boundary(false)) { @@ -432,8 +483,14 @@ void Cursor::resetAnchor() void Cursor::setCursorToAnchor() { - if (selection()) - setCursor(anchor_); + if (selection()) { + DocIterator normal = anchor_; + while (depth() < normal.depth()) + normal.pop_back(); + if (depth() < anchor_.depth() && top() <= anchor_[depth() - 1]) + ++normal.pos(); + setCursor(normal); + } } @@ -1008,6 +1065,7 @@ void Cursor::setSelection(DocIterator const & where, int n) void Cursor::clearSelection() { setSelection(false); + setWordSelection(false); setMark(false); resetAnchor(); } @@ -1248,11 +1306,11 @@ void Cursor::insert(Inset * inset0) } -void Cursor::niceInsert(docstring const & t, Parse::flags f) +void Cursor::niceInsert(docstring const & t, Parse::flags f, bool enter) { - MathData ar; + MathData ar(buffer()); asArray(t, ar, f); - if (ar.size() == 1) + if (ar.size() == 1 && (enter || selection())) niceInsert(ar[0]); else insert(ar); @@ -1264,14 +1322,14 @@ void Cursor::niceInsert(MathAtom const & t) macroModeClose(); docstring const safe = cap::grabAndEraseSelection(*this); plainInsert(t); - // enter the new inset and move the contents of the selection if possible + // If possible, enter the new inset and move the contents of the selection if (t->isActive()) { posBackward(); // be careful here: don't use 'pushBackward(t)' as this we need to // push the clone, not the original pushBackward(*nextInset()); // We may not use niceInsert here (recursion) - MathData ar; + MathData ar(buffer()); asArray(safe, ar); insert(ar); } @@ -1422,7 +1480,7 @@ bool Cursor::macroModeClose() return false; InsetMathUnknown * p = activeMacro(); p->finalize(); - MathData selection; + MathData selection(buffer()); asArray(p->selection(), selection); docstring const s = p->name(); --pos(); @@ -1440,7 +1498,8 @@ bool Cursor::macroModeClose() InsetMathNest * const in = inset().asInsetMath()->asNestInset(); if (in && in->interpretString(*this, s)) return true; - MathAtom atom = createInsetMath(name); + MathAtom atom = buffer()->getMacro(name, *this, false) ? + MathAtom(new MathMacro(buffer(), name)) : createInsetMath(name, buffer()); // try to put argument into macro, if we just inserted a macro bool macroArg = false; @@ -1841,8 +1900,6 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) if (up) { if (row > 0) { --next_row; - top().pos() - = min(tm.x2pos(pit(), next_row, xo), top().lastpos()); } else if (pit() > 0) { --pit(); TextMetrics & tm = bv_->textMetrics(text()); @@ -1850,27 +1907,30 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) tm.newParMetricsUp(); ParagraphMetrics const & pmcur = tm.parMetrics(pit()); next_row = pmcur.rows().size() - 1; - top().pos() - = min(tm.x2pos(pit(), next_row, xo), top().lastpos()); } } else { if (row + 1 < int(pm.rows().size())) { ++next_row; - top().pos() - = min(tm.x2pos(pit(), next_row, xo), top().lastpos()); } else if (pit() + 1 < int(text()->paragraphs().size())) { ++pit(); TextMetrics & tm = bv_->textMetrics(text()); if (!tm.contains(pit())) tm.newParMetricsDown(); next_row = 0; - top().pos() - = min(tm.x2pos(pit(), next_row, xo), top().lastpos()); } } + top().pos() = min(tm.x2pos(pit(), next_row, xo), top().lastpos()); + + int const xpos = tm.x2pos(pit(), next_row, xo); + bool const at_end_row = xpos == tm.x2pos(pit(), next_row, tm.width()); + bool const at_beg_row = xpos == tm.x2pos(pit(), next_row, 0); + + if (at_end_row && at_beg_row) + // make sure the cursor ends up on this row + boundary(false); + else + boundary(at_end_row); - boundary(tm.x2pos(pit(), next_row, xo) - == tm.x2pos(pit(), next_row, tm.width())); updateNeeded |= bv().checkDepm(*this, old); } @@ -1901,8 +1961,8 @@ void Cursor::handleFont(string const & font) } else { // cursor in between. split cell MathData::iterator bt = cell().begin(); - MathAtom at = createInsetMath(from_utf8(font)); - at.nucleus()->cell(0) = MathData(bt, bt + pos()); + MathAtom at = createInsetMath(from_utf8(font), buffer()); + at.nucleus()->cell(0) = MathData(buffer(), bt, bt + pos()); cell().erase(bt, bt + pos()); popBackward(); plainInsert(at); @@ -2110,9 +2170,9 @@ bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur) // notify everything on top of the common part in old cursor, // but stop if the inset claims the cursor to be invalid now for (size_type j = i; j < old.depth(); ++j) { - Cursor insetPos = old; - insetPos.cutOff(j); - if (old[j].inset().notifyCursorLeaves(insetPos, cur)) + Cursor inset_pos = old; + inset_pos.cutOff(j); + if (old[j].inset().notifyCursorLeaves(inset_pos, cur)) return true; }