adjust

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 13a10be174a5e3faae1731c559138cba15624b58..c965210e7a1c258494a2f8af0a2c3e20bd65d2d7 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -24,24 +24,34 @@ namespace lyx {
 
 
 Row::Row()
-       : pos_(0), end_(0), separator(0), hfill(0), label_hfill(0), x(0)
+       : separator(0), hfill(0), label_hfill(0), x(0),
+       sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(0), end_(0)
 {}
 
 
 Row::Row(pos_type pos)
-       : pos_(pos), end_(0)
+       : separator(0), hfill(0), label_hfill(0), x(0),
+       sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(pos), end_(0)
 {}
 
 
-void Row::pos(pos_type p)
+void Row::setCrc(size_type crc)
 {
-       pos_ = p;
+       changed_ |= crc != crc_;
+       crc_ = crc;
+}
+
+
+void Row::setDimension(Dimension const & dim)
+{
+       changed_ |= dim != dim_;
+       dim_ = dim;
 }
 
 
-pos_type Row::pos() const
+void Row::pos(pos_type p)
 {
-       return pos_;
+       pos_ = p;
 }
 
 
@@ -51,13 +61,35 @@ void Row::endpos(pos_type p)
 }
 
 
-pos_type Row::endpos() const
+void Row::setSelection(pos_type beg, pos_type end)
 {
-       return end_;
+       pos_type sel_beg_b = sel_beg;
+       if (pos_ >= beg && pos_ <= end)
+               sel_beg = pos_;
+       else if (beg > pos_ && beg <= end_)
+               sel_beg = beg;
+       else
+               sel_beg = -1;
+
+       pos_type sel_end_b = sel_end;
+       if (end_ >= beg && end_ <= end)
+               sel_end = end_;
+       else if (end < end_ && end >= pos_)
+               sel_end = end;
+       else
+               sel_end = -1;
+/*
+                       && ((rit->pos() >= beg.pos() && rit->pos() <= end.pos())
+                               || (rit->endpos() >= beg.pos() && rit->endpos() <= end.pos())
+                               || (beg.pos() >= rit->pos() && beg.pos() <= rit->endpos())
+                               || (end.pos() >= rit->pos() && end.pos() <= rit->endpos()));
+*/
+       changed_ |= sel_beg_b != sel_beg;
+       changed_ |= sel_end_b != sel_end;
 }
 
 
-void Row::dump(const char * s) const
+void Row::dump(char const * s) const
 {
        lyxerr << s << " pos: " << pos_ << " end: " << end_
                << " width: " << dim_.wid