X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=572e062876d461d8680adb218b857e59c51eddc2;hb=4df7d8ab1ae443119057562fb76c2e438c053eef;hp=cd05e2564562205806ce2d9fa32d35139a0821b5;hpb=4b775f53930c1e19313be7b55c3a22d8c3290484;p=lyx.git diff --git a/src/Cursor.cpp b/src/Cursor.cpp index cd05e25645..572e062876 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -321,6 +321,15 @@ void Cursor::dispatch(FuncRequest const & cmd0) // object will be used again. if (!disp_.dispatched()) { LYXERR(Debug::DEBUG, "RESTORING OLD CURSOR!"); + // We might have invalidated the cursor when removing an empty + // paragraph while the cursor could not be moved out the inset + // while we initially thought we could. This might happen when + // a multiline inset becomes an inline inset when the second + // paragraph is removed. + if (safe.pit() > safe.lastpit()) { + safe.pit() = safe.lastpit(); + safe.pos() = safe.lastpos(); + } operator=(safe); disp_.update(Update::None); disp_.dispatched(false); @@ -426,6 +435,12 @@ void Cursor::resetAnchor() } +void Cursor::setCursorToAnchor() +{ + if (selection()) + setCursor(anchor_); +} + bool Cursor::posBackward() { @@ -644,7 +659,7 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) // The cursor is painted *before* the character at pos(), or, if 'boundary' // is true, *after* the character at (pos() - 1). So we already have one // known position around the cursor: - pos_type known_pos = boundary() ? pos() - 1 : pos(); + pos_type const known_pos = boundary() && pos() > 0 ? pos() - 1 : pos(); // edge case: if we're at the end of the paragraph, things are a little // different (because lastpos is a position which does not really "exist" @@ -653,8 +668,8 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) if (par.isRTL(buf.params())) { left_pos = -1; right_pos = bidi.vis2log(row.pos()); - } - else { // LTR paragraph + } else { + // LTR paragraph right_pos = -1; left_pos = bidi.vis2log(row.endpos() - 1); } @@ -669,11 +684,10 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) // For an RTL character, "before" means "to the right" and "after" means // "to the left"; and for LTR, it's the reverse. So, 'known_pos' is to the // right of the cursor if (RTL && boundary) or (!RTL && !boundary): - bool known_pos_on_right = (cur_is_RTL == boundary()); + bool const known_pos_on_right = cur_is_RTL == boundary(); // So we now know one of the positions surrounding the cursor. Let's - // determine the other one: - + // determine the other one: if (known_pos_on_right) { right_pos = known_pos; // *visual* position of 'left_pos': @@ -687,9 +701,9 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) if (bidi.inRange(v_left_pos) && bidi.vis2log(v_left_pos) + 1 == row.endpos() && row.endpos() < lastpos() - && par.isSeparator(bidi.vis2log(v_left_pos))) { + && par.isSeparator(bidi.vis2log(v_left_pos))) --v_left_pos; - } + // calculate the logical position of 'left_pos', if in row if (!bidi.inRange(v_left_pos)) left_pos = -1; @@ -699,14 +713,14 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) // separator", set 'right_pos' to the *next* position to the right. if (right_pos + 1 == row.endpos() && row.endpos() < lastpos() && par.isSeparator(right_pos)) { - pos_type v_right_pos = bidi.log2vis(right_pos) + 1; + pos_type const v_right_pos = bidi.log2vis(right_pos) + 1; if (!bidi.inRange(v_right_pos)) right_pos = -1; else right_pos = bidi.vis2log(v_right_pos); } - } - else { // known_pos is on the left + } else { + // known_pos is on the left left_pos = known_pos; // *visual* position of 'right_pos' pos_type v_right_pos = bidi.log2vis(left_pos) + 1; @@ -715,9 +729,9 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) if (bidi.inRange(v_right_pos) && bidi.vis2log(v_right_pos) + 1 == row.endpos() && row.endpos() < lastpos() - && par.isSeparator(bidi.vis2log(v_right_pos))) { + && par.isSeparator(bidi.vis2log(v_right_pos))) ++v_right_pos; - } + // calculate the logical position of 'right_pos', if in row if (!bidi.inRange(v_right_pos)) right_pos = -1; @@ -727,7 +741,7 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) // separator", set 'left_pos' to the *next* position to the left. if (left_pos + 1 == row.endpos() && row.endpos() < lastpos() && par.isSeparator(left_pos)) { - pos_type v_left_pos = bidi.log2vis(left_pos) - 1; + pos_type const v_left_pos = bidi.log2vis(left_pos) - 1; if (!bidi.inRange(v_left_pos)) left_pos = -1; else @@ -1770,8 +1784,34 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) else row = pm.pos2row(pos()); - if (atFirstOrLastRow(up)) + if (atFirstOrLastRow(up)) { + // Is there a place for the cursor to go ? If yes, we + // can execute the DEPM, otherwise we should keep the + // paragraph to host the cursor. + Cursor dummy = *this; + bool valid_destination = false; + for(; dummy.depth(); dummy.pop()) + if (!dummy.atFirstOrLastRow(up)) { + valid_destination = true; + break; + } + + // will a next dispatch follow and if there is a new + // dispatch will it move the cursor out ? + if (depth() > 1 && valid_destination) { + // The cursor hasn't changed yet. This happens when + // you e.g. move out of an inset. And to give the + // DEPM the possibility of doing something we must + // provide it with two different cursors. (Lgb, vfr) + dummy = *this; + dummy.pos() = dummy.pos() == 0 ? dummy.lastpos() : 0; + dummy.pit() = dummy.pit() == 0 ? dummy.lastpit() : 0; + + updateNeeded |= bv().checkDepm(dummy, *this); + updateTextTargetOffset(); + } return false; + } // with and without selection are handled differently if (!selection()) { @@ -1784,16 +1824,16 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) tm.editXY(*this, xo, yo + textRow().descent() + 1); clearSelection(); - // This happens when you move out of an inset. - // And to give the DEPM the possibility of doing - // something we must provide it with two different - // cursors. (Lgb) + // This happens when you move out of an inset. + // And to give the DEPM the possibility of doing + // something we must provide it with two different + // cursors. (Lgb) Cursor dummy = *this; if (dummy == old) ++dummy.pos(); if (bv().checkDepm(dummy, old)) { updateNeeded = true; - // Make sure that cur gets back whatever happened to dummy(Lgb) + // Make sure that cur gets back whatever happened to dummy(Lgb) operator=(dummy); } } else { @@ -2048,7 +2088,7 @@ bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur) && !cur.buffer()->isClean() && cur.inTexted() && old.inTexted() && cur.pit() != old.pit()) { - old.paragraph().updateWords(old.top()); + old.paragraph().updateWords(); } // notify everything on top of the common part in old cursor,