X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.cpp;h=697e526094b7f399801f4d62d24f7b39f5fc503a;hb=bf2bf2eaedadf39a6398db624c8b6c52099ca31d;hp=16ce90d473175e44902d90642cc8c6f55b3c4dc3;hpb=8491962c6bc1c73df076fa4807cc6ee295ccce41;p=lyx.git diff --git a/src/Row.cpp b/src/Row.cpp index 16ce90d473..697e526094 100644 --- a/src/Row.cpp +++ b/src/Row.cpp @@ -115,14 +115,13 @@ pos_type Row::Element::x2pos(int &x) const case SPACE: // those elements contain only one position. Round to // the closest side. - if (x > full_width()) { + if (x > (full_width() + 1) / 2) { x = int(full_width()); i = !isRTL(); } else { x = 0; i = isRTL(); } - } //lyxerr << "=> p=" << pos + i << " x=" << x << endl; return pos + i; @@ -163,43 +162,37 @@ Row::Row() : separator(0), label_hfill(0), left_margin(0), right_margin(0), sel_beg(-1), sel_end(-1), begin_margin_sel(false), end_margin_sel(false), - changed_(false), crc_(0), - pit_(0), pos_(0), end_(0), right_boundary_(false) + changed_(true), + pit_(0), pos_(0), end_(0), + right_boundary_(false), flushed_(false), rtl_(false), + changebar_(false) {} -void Row::setCrc(size_type crc) const -{ - changed_ = crc != crc_; - crc_ = crc; -} - - -bool Row::isMarginSelected(bool left_margin, DocIterator const & beg, +bool Row::isMarginSelected(bool left, DocIterator const & beg, DocIterator const & end) const { - pos_type const sel_pos = left_margin ? sel_beg : sel_end; - pos_type const margin_pos = left_margin ? pos_ : end_; - - // Is the chosen margin selected ? - if (sel_pos == margin_pos) { - if (beg.pos() == end.pos()) - // This is a special case in which the space between after - // pos i-1 and before pos i is selected, i.e. the margins - // (see DocIterator::boundary_). - return beg.boundary() && !end.boundary(); - else if (end.pos() == margin_pos) - // If the selection ends around the margin, it is only - // drawn if the cursor is after the margin. - return !end.boundary(); - else if (beg.pos() == margin_pos) - // If the selection begins around the margin, it is - // only drawn if the cursor is before the margin. - return beg.boundary(); - else - return true; - } - return false; + pos_type const sel_pos = left ? sel_beg : sel_end; + pos_type const margin_pos = left ? pos_ : end_; + + // Is there a selection and is the chosen margin selected ? + if (!selection() || sel_pos != margin_pos) + return false; + else if (beg.pos() == end.pos()) + // This is a special case in which the space between after + // pos i-1 and before pos i is selected, i.e. the margins + // (see DocIterator::boundary_). + return beg.boundary() && !end.boundary(); + else if (end.pos() == margin_pos) + // If the selection ends around the margin, it is only + // drawn if the cursor is after the margin. + return !end.boundary(); + else if (beg.pos() == margin_pos) + // If the selection begins around the margin, it is + // only drawn if the cursor is before the margin. + return beg.boundary(); + else + return true; } @@ -208,28 +201,35 @@ void Row::setSelectionAndMargins(DocIterator const & beg, { setSelection(beg.pos(), end.pos()); - if (selection()) { - end_margin_sel = isMarginSelected(false, beg, end); - begin_margin_sel = isMarginSelected(true, beg, end); - } + change(end_margin_sel, isMarginSelected(false, beg, end)); + change(begin_margin_sel, isMarginSelected(true, beg, end)); +} + + +void Row::clearSelectionAndMargins() const +{ + change(sel_beg, -1); + change(sel_end, -1); + change(end_margin_sel, false); + change(begin_margin_sel, false); } void Row::setSelection(pos_type beg, pos_type end) const { if (pos_ >= beg && pos_ <= end) - sel_beg = pos_; + change(sel_beg, pos_); else if (beg > pos_ && beg <= end_) - sel_beg = beg; + change(sel_beg, beg); else - sel_beg = -1; + change(sel_beg, -1); if (end_ >= beg && end_ <= end) - sel_end = end_; + change(sel_end,end_); else if (end < end_ && end >= pos_) - sel_end = end; + change(sel_end, end); else - sel_end = -1; + change(sel_end, -1); } @@ -275,7 +275,7 @@ ostream & operator<<(ostream & os, Row const & row) << " ascent: " << row.dim_.asc << " descent: " << row.dim_.des << " separator: " << row.separator - << " label_hfill: " << row.label_hfill + << " label_hfill: " << row.label_hfill << " row_boundary: " << row.right_boundary() << "\n"; double x = row.left_margin; Row::Elements::const_iterator it = row.elements_.begin(); @@ -371,6 +371,8 @@ void Row::finalizeLast() if (elt.final) return; elt.final = true; + if (elt.change.changed()) + changebar_ = true; if (elt.type == STRING) { dim_.wid -= elt.dim.wid; @@ -565,6 +567,56 @@ void Row::reverseRTL(bool const rtl_par) // If the paragraph itself is RTL, reverse everything if (rtl_par) reverse(elements_.begin(), elements_.end()); + rtl_ = rtl_par; } +Row::const_iterator const +Row::findElement(pos_type const pos, bool const boundary, double & x) const +{ + /** + * When boundary is true, position i is in the row element (pos, endpos) + * if + * pos < i <= endpos + * whereas, when boundary is false, the test is + * pos <= i < endpos + * The correction below allows to handle both cases. + */ + int const boundary_corr = (boundary && pos) ? -1 : 0; + + x = left_margin; + + /** Early return in trivial cases + * 1) the row is empty + * 2) the position is the left-most position of the row; there + * is a quirk here however: if the first element is virtual + * (end-of-par marker for example), then we have to look + * closer + */ + if (empty() + || (pos == begin()->left_pos() && !boundary + && !begin()->isVirtual())) + return begin(); + + Row::const_iterator cit = begin(); + for ( ; cit != end() ; ++cit) { + /** Look whether the cursor is inside the element's + * span. Note that it is necessary to take the + * boundary into account, and to accept virtual + * elements, which have pos == endpos. + */ + if (pos + boundary_corr >= cit->pos + && (pos + boundary_corr < cit->endpos || cit->isVirtual())) { + x += cit->pos2x(pos); + break; + } + x += cit->full_width(); + } + + if (cit == end()) + --cit; + + return cit; +} + + } // namespace lyx