]> git.lyx.org Git - features.git/blobdiff - src/TextMetrics.cpp
Transfer Paragraph::hfillExpansion() to ParagraphMetrics. This also reduce the depend...
[features.git] / src / TextMetrics.cpp
index 81cd7c158fbd4a65121a735b0ca706373eb55d42..81a9626966eab4803946b10b1e62f1e0368a9d88 100644 (file)
@@ -22,6 +22,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "bufferview_funcs.h"
 #include "Color.h"
 #include "CoordCache.h"
 #include "debug.h"
@@ -40,6 +41,8 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include <boost/current_function.hpp>
+
 using std::max;
 using std::min;
 using std::endl;
@@ -817,6 +820,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
        int const xo = main_text_? 0 : bv_->coordCache().get(text_, pit).x_;
        x -= xo;
        Paragraph const & par = text_->getPar(pit);
+       ParagraphMetrics const & pm = par_metrics_[pit];
        Bidi bidi;
        bidi.computeTables(par, buffer, row);
 
@@ -853,7 +857,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit,
                                tmpx -= singleWidth(pit, body_pos - 1);
                }
 
-               if (par.hfillExpansion(row, c)) {
+               if (pm.hfillExpansion(row, c)) {
                        tmpx += singleWidth(pit, c);
                        if (c >= body_pos)
                                tmpx += row.hfill;
@@ -969,6 +973,7 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const
 {
        if (par_metrics_.empty())
                return;
+
        ParMetricsCache::const_iterator it = par_metrics_.begin();
        ParMetricsCache::const_iterator const end = par_metrics_.end();
        y -= it->second.ascent();
@@ -1050,7 +1055,163 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
        // Re-enable screen drawing for future use of the painter.
        pi.pain.setDrawingEnabled(true);
 
-       LYXERR(Debug::PAINTING) << "." << endl;
+       //LYXERR(Debug::PAINTING) << "." << endl;
+}
+
+
+// only used for inset right now. should also be used for main text
+void TextMetrics::drawSelection(PainterInfo & pi, int x, int) const
+{
+       Cursor & cur = bv_->cursor();
+       if (!cur.selection())
+               return;
+       if (!ptr_cmp(cur.text(), text_))
+               return;
+
+       LYXERR(Debug::DEBUG)
+               << BOOST_CURRENT_FUNCTION
+               << "draw selection at " << x
+               << endl;
+
+       DocIterator beg = cur.selectionBegin();
+       DocIterator end = cur.selectionEnd();
+
+       // the selection doesn't touch the visible screen?
+       if (bv_funcs::status(bv_, beg) == bv_funcs::CUR_BELOW
+           || bv_funcs::status(bv_, end) == bv_funcs::CUR_ABOVE)
+               return;
+
+       ParagraphMetrics const & pm1 = par_metrics_[beg.pit()];
+       ParagraphMetrics const & pm2 = par_metrics_[end.pit()];
+       Row const & row1 = pm1.getRow(beg.pos(), beg.boundary());
+       Row const & row2 = pm2.getRow(end.pos(), end.boundary());
+
+       // clip above
+       int middleTop;
+       bool const clipAbove = 
+               (bv_funcs::status(bv_, beg) == bv_funcs::CUR_ABOVE);
+       if (clipAbove)
+               middleTop = 0;
+       else
+               middleTop = bv_funcs::getPos(*bv_, beg, beg.boundary()).y_ + row1.descent();
+       
+       // clip below
+       int middleBottom;
+       bool const clipBelow = 
+               (bv_funcs::status(bv_, end) == bv_funcs::CUR_BELOW);
+       if (clipBelow)
+               middleBottom = bv_->workHeight();
+       else
+               middleBottom = bv_funcs::getPos(*bv_, end, end.boundary()).y_ - row2.ascent();
+
+       // start and end in the same line?
+       if (!(clipAbove || clipBelow) && &row1 == &row2)
+               // then only draw this row's selection
+               drawRowSelection(pi, x, row1, beg, end, false, false);
+       else {
+               if (!clipAbove) {
+                       // get row end
+                       DocIterator begRowEnd = beg;
+                       begRowEnd.pos() = row1.endpos();
+                       begRowEnd.boundary(true);
+                       
+                       // draw upper rectangle
+                       drawRowSelection(pi, x, row1, beg, begRowEnd, false, true);
+               }
+                       
+               if (middleTop < middleBottom) {
+                       // draw middle rectangle
+                       pi.pain.fillRectangle(x, middleTop, width(), middleBottom - middleTop,
+                               Color::selection);
+               }
+
+               if (!clipBelow) {
+                       // get row begin
+                       DocIterator endRowBeg = end;
+                       endRowBeg.pos() = row2.pos();
+                       endRowBeg.boundary(false);
+                       
+                       // draw low rectangle
+                       drawRowSelection(pi, x, row2, endRowBeg, end, true, false);
+               }
+       }
+}
+
+
+void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
+               DocIterator const & beg, DocIterator const & end,
+               bool drawOnBegMargin, bool drawOnEndMargin) const
+{
+       Buffer & buffer = bv_->buffer();
+       DocIterator cur = beg;
+       int x1 = text_->cursorX(*bv_, beg.top(), beg.boundary());
+       int x2 = text_->cursorX(*bv_, end.top(), end.boundary());
+       int y1 = bv_funcs::getPos(*bv_, cur, cur.boundary()).y_ - row.ascent();
+       int y2 = y1 + row.height();
+       
+       // draw the margins
+       if (drawOnBegMargin) {
+               if (text_->isRTL(buffer, beg.paragraph()))
+                       pi.pain.fillRectangle(x + x1, y1, width() - x1, y2 - y1, Color::selection);
+               else
+                       pi.pain.fillRectangle(x, y1, x1, y2 - y1, Color::selection);
+       }
+       
+       if (drawOnEndMargin) {
+               if (text_->isRTL(buffer, beg.paragraph()))
+                       pi.pain.fillRectangle(x, y1, x2, y2 - y1, Color::selection);
+               else
+                       pi.pain.fillRectangle(x + x2, y1, width() - x2, y2 - y1, Color::selection);
+       }
+       
+       // if we are on a boundary from the beginning, it's probably
+       // a RTL boundary and we jump to the other side directly as this
+       // segement is 0-size and confuses the logic below
+       if (cur.boundary())
+               cur.boundary(false);
+       
+       // go through row and draw from RTL boundary to RTL boundary
+       while (cur < end) {
+               bool drawNow = false;
+               
+               // simplified cursorRight code below which does not
+               // descend into insets and which does not go into the
+               // next line. Compare the logic with the original cursorRight
+               
+               // 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_->isRTLBoundary(buffer, cur.paragraph(), 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);
+                       drawNow = 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_->cursorX(*bv_, cur.top(), cur.boundary());
+               }
+               
+               if (!(cur < end) || drawNow) {
+                       x2 = text_->cursorX(*bv_, cur.top(), cur.boundary());
+                       pi.pain.fillRectangle(x + 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 Text::pos2x(pit_type pit, pos_type pos) const