- while (cur < end) {
- bool draw_now = false;
-
- // simplified cursorForward code below which does not
- // descend into insets and which does not go into the
- // next line. Compare the logic with the original cursorForward
-
- // if left of boundary -> just jump to right side, but
- // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
- if (cur.boundary()) {
- cur.boundary(false);
- } else if (text_metrics_.isRTLBoundary(cur.pit(), cur.pos() + 1)) {
- // in front of RTL boundary -> Stay on this side of the boundary
- // because: ab|cDDEEFFghi -> abc|DDEEFFghi
- ++cur.pos();
- cur.boundary(true);
- draw_now = true;
- } else {
- // move right
- ++cur.pos();
-
- // line end?
- if (cur.pos() == row_.endpos())
- cur.boundary(true);
- }
-
- if (x1 == -1) {
- // the previous segment was just drawn, now the next starts
- x1 = text_metrics_.cursorX(cur.top(), cur.boundary());
- }
-
- if (!(cur < end) || draw_now) {
- x2 = text_metrics_.cursorX(cur.top(), cur.boundary());
- pi_.pain.fillRectangle(int(xo_ + min(x1, x2)), y1, abs(x2 - x1),
- y2 - y1, Color_selection);
-
- // reset x1, so it is set again next round (which will be on the
- // right side of a boundary or at the selection end)
- x1 = -1;
+ int x = xo_ + row_.left_margin;
+ for (auto const & e : row_) {
+ // at least part of text selected?
+ bool const some_sel = (e.endpos >= row_.sel_beg && e.pos <= row_.sel_end)
+ || pi_.selected;
+ // all the text selected?
+ bool const all_sel = (e.pos >= row_.sel_beg && e.endpos <= row_.sel_end)
+ || pi_.selected;
+
+ if (all_sel) {
+ pi_.pain.fillRectangle(x, y1, e.full_width(), y2 - y1,
+ Color_selection);
+ } else if (some_sel) {
+ pos_type const from = min(max(row_.sel_beg, e.pos), e.endpos);
+ pos_type const to = max(min(row_.sel_end, e.endpos), e.pos);
+ int x1 = e.pos2x(from);
+ int x2 = e.pos2x(to);
+ if (x1 > x2)
+ swap(x1, x2);
+ pi_.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1,
+ Color_selection);