X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor_slice.C;h=eda679a2e95750fa10c79da8517003c57dd63ba3;hb=61133c4b5625993f600ffa7d209c3e2bc28d26f6;hp=278a29e8bbece3630076ccc7adcca2fa32be5c53;hpb=d8f81752eb871b6c0fe6ee681b5dde7536df3374;p=lyx.git

diff --git a/src/cursor_slice.C b/src/cursor_slice.C
index 278a29e8bb..eda679a2e9 100644
--- a/src/cursor_slice.C
+++ b/src/cursor_slice.C
@@ -15,9 +15,11 @@
 
 #include "cursor_slice.h"
 #include "debug.h"
+#include "lyxtext.h"
+#include "paragraph.h"
 
 #include "mathed/math_inset.h"
-#include "insets/updatableinset.h"
+#include "mathed/math_data.h"
 
 #include <boost/assert.hpp>
 
@@ -25,127 +27,86 @@ using std::endl;
 
 
 CursorSlice::CursorSlice()
-	: inset_(0), idx_(0), par_(0), pos_(0), boundary_(false)
+	: inset_(0), idx_(0), pit_(0), pos_(0)
 {}
 
 
-CursorSlice::CursorSlice(InsetBase * p)
-	: inset_(p), idx_(0), par_(0), pos_(0), boundary_(false)
+CursorSlice::CursorSlice(InsetBase & p)
+	: inset_(&p), idx_(0), pit_(0), pos_(0)
 {
-	///BOOST_ASSERT(inset_);
-}
-
-
-void CursorSlice::par(lyx::paroffset_type par)
-{
-	par_ = par;
-}
-
-
-lyx::paroffset_type CursorSlice::par() const
-{
-	return par_;
-}
-
-
-void CursorSlice::pos(lyx::pos_type pos)
-{
-	pos_ = pos;
-}
-
-
-lyx::pos_type CursorSlice::pos() const
-{
-	return pos_;
-}
-
-
-void CursorSlice::boundary(bool boundary)
-{
-	boundary_ = boundary;
-}
-
-
-bool CursorSlice::boundary() const
-{
-	return boundary_;
+	BOOST_ASSERT(inset_);
 }
 
 
-MathInset * CursorSlice::asMathInset() const
+MathArray & CursorSlice::cell() const
 {
-	return static_cast<MathInset *>(const_cast<InsetBase *>(inset_));
+	return inset_->asMathInset()->cell(idx_);
 }
 
 
-UpdatableInset * CursorSlice::asUpdatableInset() const
+Paragraph & CursorSlice::paragraph()
 {
-	return static_cast<UpdatableInset *>(const_cast<InsetBase *>(inset_));
+	return text()->getPar(pit_);
 }
 
 
-MathArray & CursorSlice::cell(CursorSlice::idx_type idx) const
+Paragraph const & CursorSlice::paragraph() const
 {
-	BOOST_ASSERT(inset_);
-	return asMathInset()->cell(idx);
+	return text()->getPar(pit_);
 }
 
 
-MathArray & CursorSlice::cell() const
+CursorSlice::pos_type CursorSlice::lastpos() const
 {
 	BOOST_ASSERT(inset_);
-	return asMathInset()->cell(idx_);
-}
-
-
-void CursorSlice::getPos(int & x, int & y) const
-{
-	asMathInset()->getPos(idx_, pos_, x, y);
+	return inset_->asMathInset() ? cell().size() : paragraph().size();
 }
 
 
-void CursorSlice::setPos(int pos)
+CursorSlice::row_type CursorSlice::row() const
 {
-	pos_ = pos;
+	BOOST_ASSERT(asMathInset());
+	return asMathInset()->row(idx_);
 }
 
 
-LyXText * CursorSlice::text() const
+CursorSlice::col_type CursorSlice::col() const
 {
-	return asUpdatableInset()->getText(idx_);
+	BOOST_ASSERT(asMathInset());
+	return asMathInset()->col(idx_);
 }
 
 
 bool operator==(CursorSlice const & p, CursorSlice const & q)
 {
-	return p.inset_ == q.inset_
-	       && p.idx_ == q.idx_
-	       && p.par_ == q.par_
-	       && p.pos_ == q.pos_;
+	return &p.inset() == &q.inset()
+	       && p.idx() == q.idx()
+	       && p.pit() == q.pit()
+	       && p.pos() == q.pos();
 }
 
 
 bool operator!=(CursorSlice const & p, CursorSlice const & q)
 {
-	return p.inset_ != q.inset_
-	       || p.idx_ != q.idx_
-	       || p.par_ != q.par_
-	       || p.pos_ != q.pos_;
+	return &p.inset() != &q.inset()
+	       || p.idx() != q.idx()
+	       || p.pit() != q.pit()
+	       || p.pos() != q.pos();
 }
 
 
 bool operator<(CursorSlice const & p, CursorSlice const & q)
 {
-	if (p.inset_ != q.inset_) {
+	if (&p.inset() != &q.inset()) {
 		lyxerr << "can't compare cursor and anchor in different insets\n"
 		       << "p: " << p << '\n' << "q: " << q << endl;
-		return true;
+		BOOST_ASSERT(false);
 	}
-	if (p.idx_ != q.idx_)
-		return p.idx_ < q.idx_;
-	if (p.par_ != q.par_)
-		return p.par_ < q.par_;
-	return p.pos_ < q.pos_;
+	if (p.idx() != q.idx())
+		return p.idx() < q.idx();
+	if (p.pit() != q.pit())
+		return p.pit() < q.pit();
+	return p.pos() < q.pos();
 }
 
 
@@ -155,24 +116,21 @@ bool operator>(CursorSlice const & p, CursorSlice const & q)
 }
 
 
-//std::ostream & operator<<(std::ostream & os, CursorSlice const & p)
-//{
-//	os << "(par: " << p.inset_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ')';
-//	return os;
-//}
+bool operator<=(CursorSlice const & p, CursorSlice const & q)
+{
+	return !(q < p);
+}
 
 
 std::ostream & operator<<(std::ostream & os, CursorSlice const & item)
 {
-	os << " inset: " << item.inset_
+	return os
+	   << "inset: " << &item.inset()
 //	   << " text: " << item.text()
-	   << " idx: " << item.idx_
-//	   << " par: " << item.par_
-//	   << " pos: " << item.pos_
-//	   << " x: " << item.inset_->x()
-//	   << " y: " << item.inset_->y()
+	   << " idx: " << item.idx()
+	   << " par: " << item.pit()
+	   << " pos: " << item.pos()
+//	   << " x: " << item.inset().x()
+//	   << " y: " << item.inset().y()
 ;
-	return os;
 }
-
-