#include "CursorSlice.h"
#include <vector>
-#include <algorithm>
+#include <algorithm> // std::min in MSVC 2017
namespace lyx {
class DocIterator
{
-public:
- /// type for cell number in inset
- typedef CursorSlice::idx_type idx_type;
- /// type for row indices
- typedef CursorSlice::row_type row_type;
- /// type for col indices
- typedef CursorSlice::col_type col_type;
-
public:
///
- DocIterator();
- ///
- explicit DocIterator(Buffer *buf);
+ DocIterator() = default;
+
+ // We could be able to get rid of this if only every BufferView were
+ // associated to a buffer on construction.
+ explicit DocIterator(Buffer *buf)
+ : buffer_(buf)
+ {}
/// access to owning buffer
Buffer * buffer() const { return buffer_; }
/// does this iterator have any content?
bool empty() const { return slices_.empty(); }
+ /// is this the begin position?
+ bool atBegin() const { return depth() == 1 && pit() == 0 && pos() == 0; }
/// is this the end position?
bool atEnd() const { return slices_.empty(); }
- /// is this the last possible position?
- bool atLastPos() const { return pit() == lastpit() && pos() == lastpos(); }
/// checks the cursor slices for disabled spell checker insets
bool allowSpellCheck() const;
void forwardInset();
/// move backward one logical position
void backwardPos();
+ /// move backward one logical position, skip collapsed insets
+ void backwardPosIgnoreCollapsed();
/// move backward one physical character or inset
void backwardChar();
/// move backward one paragraph
friend DocIterator doc_iterator_begin(Buffer const * buf, Inset const * inset);
friend DocIterator doc_iterator_end(Buffer const * buf, Inset const * inset);
///
- explicit DocIterator(Buffer * buf, Inset * inset);
+ explicit DocIterator(Buffer * buf, Inset * inset)
+ : inset_(inset), buffer_(buf)
+ {}
+
/**
* Normally, when the cursor is at position i, it is painted *before*
* the character at position i. However, what if we want the cursor
* happen *before* i. If the cursor, however, were painted *after* i, that
* would be very unnatural...
*/
- bool boundary_;
+ bool boundary_ = false;
///
std::vector<CursorSlice> const & internalData() const { return slices_; }
///
std::vector<CursorSlice> slices_;
///
- Inset * inset_;
+ Inset * inset_ = nullptr;
///
- Buffer * buffer_;
+ Buffer * buffer_ = nullptr;
};