cmake: remove 2.8 warning

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index dda37ae3353b1792d266b512b6c79bc24d562a31..5462e90912596abff928aad9fa5341cac6b1acd5 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -700,7 +700,6 @@ CursorStatus BufferView::cursorStatus(DocIterator const & dit) const
 
 void BufferView::bookmarkEditPosition()
 {
-       d->cursor_.markEditPosition();
        // Don't eat cpu time for each keystroke
        if (d->cursor_.paragraph().id() == d->bookmark_edit_position_)
                return;
@@ -1457,6 +1456,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                buffer_.text().cursorBottom(cur);
                // accept everything in a single step to support atomic undo
                buffer_.text().acceptOrRejectChanges(cur, Text::ACCEPT);
+               cur.resetAnchor();
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.screenUpdate(Update::Force | Update::FitCursor);
                dr.forceBufferUpdate();
@@ -1470,6 +1470,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                // reject everything in a single step to support atomic undo
                // Note: reject does not work recursively; the user may have to repeat the operation
                buffer_.text().acceptOrRejectChanges(cur, Text::REJECT);
+               cur.resetAnchor();
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.screenUpdate(Update::Force | Update::FitCursor);
                dr.forceBufferUpdate();
@@ -1682,6 +1683,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
                d->text_metrics_[&buffer_.text()].editXY(cur, p.x_, p.y_,
                        true, act == LFUN_SCREEN_UP); 
+               cur.resetAnchor();
                //FIXME: what to do with cur.x_target()?
                bool update = in_texted && cur.bv().checkDepm(cur, old);
                cur.finishUndo();
@@ -1752,7 +1754,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        Inset * ins = cur.nextInset();
                        if (!ins)
                                break;
-                       docstring insname = ins->name();
+                       docstring insname = ins->layoutName();
                        while (!insname.empty()) {
                                if (insname == name || name == from_utf8("*")) {
                                        cur.recordUndo();
@@ -2191,6 +2193,8 @@ void BufferView::setCursorFromRow(int row)
                buffer_.text().setCursor(d->cursor_, 0, 0);
        else
                buffer_.text().setCursor(d->cursor_, buffer_.getParFromID(tmpid).pit(), tmppos);
+       d->cursor_.setSelection(false);
+       d->cursor_.resetAnchor();
        recenter();
 }
 
@@ -2276,6 +2280,11 @@ void BufferView::setCursor(DocIterator const & dit)
 
        d->cursor_.setCursor(dit);
        d->cursor_.setSelection(false);
+       // FIXME
+       // It seems on general grounds as if this is probably needed, but
+       // it is not yet clear.
+       // See bug #7394 and r38388.
+       // d->cursor.resetAnchor();
 }
 
 
@@ -2315,12 +2324,13 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
        d->cursor_.macroModeClose();
 
        // Has the cursor just left the inset?
-       bool leftinset = (&d->cursor_.inset() != &cur.inset());
+       bool const leftinset = (&d->cursor_.inset() != &cur.inset());
        if (leftinset)
                d->cursor_.fixIfBroken();
 
        // FIXME: shift-mouse selection doesn't work well across insets.
-       bool do_selection = select && &d->cursor_.normalAnchor().inset() == &cur.inset();
+       bool const do_selection = 
+                       select && &d->cursor_.normalAnchor().inset() == &cur.inset();
 
        // do the dEPM magic if needed
        // FIXME: (1) move this to InsetText::notifyCursorLeaves?
@@ -2364,6 +2374,42 @@ void BufferView::putSelectionAt(DocIterator const & cur,
 }
 
 
+bool BufferView::selectIfEmpty(DocIterator & cur)
+{
+       if (!cur.paragraph().empty())
+               return false;
+
+       pit_type const beg_pit = cur.pit();
+       if (beg_pit > 0) {
+               // The paragraph associated to this item isn't
+               // the first one, so it can be selected
+               cur.backwardPos();
+       } else {
+               // We have to resort to select the space between the
+               // end of this item and the begin of the next one
+               cur.forwardPos();
+       }
+       if (cur.empty()) {
+               // If it is the only item in the document,
+               // nothing can be selected
+               return false;
+       }
+       pit_type const end_pit = cur.pit();
+       pos_type const end_pos = cur.pos();
+       d->cursor_.clearSelection();
+       d->cursor_.reset();
+       d->cursor_.setCursor(cur);
+       d->cursor_.pit() = beg_pit;
+       d->cursor_.pos() = 0;
+       d->cursor_.setSelection(false);
+       d->cursor_.resetAnchor();
+       d->cursor_.pit() = end_pit;
+       d->cursor_.pos() = end_pos;
+       d->cursor_.setSelection();
+       return true;
+}
+
+
 Cursor & BufferView::cursor()
 {
        return d->cursor_;