#include "Row.h"
#include "MetricsInfo.h"
#include "Paragraph.h"
-#include "ParagraphMetrics.h"
#include "ParagraphParameters.h"
#include "TextMetrics.h"
#include "VSpace.h"
#include "support/lassert.h"
#include <boost/crc.hpp>
+#include <stdlib.h>
+
using namespace std;
namespace lyx {
RowPainter::RowPainter(PainterInfo & pi,
- Text const & text, pit_type pit, Row const & row, int x, int y)
+ Text const & text, Row const & row, int x, int y)
: pi_(pi), text_(text),
- text_metrics_(pi_.base.bv->textMetrics(&text)),
+ tm_(pi_.base.bv->textMetrics(&text)),
pars_(text.paragraphs()),
- row_(row), pit_(pit), par_(text.paragraphs()[pit]),
- pm_(text_metrics_.parMetrics(pit)), change_(pi_.change_),
- xo_(x), yo_(y), width_(text_metrics_.width()),
- solid_line_thickness_(1), solid_line_offset_(1),
- dotted_line_thickness_(1)
+ row_(row), par_(text.paragraphs()[row.pit()]),
+ change_(pi_.change_),
+ xo_(x), yo_(y)
{
- if (lyxrc.zoom >= 200) {
- // derive the line thickness from zoom factor
- // the zoom is given in percent
- // (increase thickness at 250%, 450% etc.)
- solid_line_thickness_ = (lyxrc.zoom + 50) / 200;
- // adjust line_offset_ too
- solid_line_offset_ = 1 + solid_line_thickness_ / 2;
- }
- if (lyxrc.zoom >= 100) {
- // derive the line thickness from zoom factor
- // the zoom is given in percent
- // (increase thickness at 150%, 250% etc.)
- dotted_line_thickness_ = (lyxrc.zoom + 50) / 100;
- }
-
x_ = row_.left_margin + xo_;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
//row_.dump();
- LBUFERR(pit >= 0);
- LBUFERR(pit < int(text.paragraphs().size()));
+ LBUFERR(row.pit() >= 0);
+ LBUFERR(row.pit() < int(text.paragraphs().size()));
}
{
FontInfo f = text_.labelFont(par_);
// selected text?
- if (row_.begin_margin_sel || pi_.selected)
+ if ((row_.selection() && row_.begin_margin_sel) || pi_.selected)
f.setPaintColor(Color_selectiontext);
return f;
}
// This draws green lines around each inset.
-void RowPainter::paintInset(Row::Element const & e)
+void RowPainter::paintInset(Row::Element const & e) const
{
// Handle selection
bool const pi_selected = pi_.selected;
e.inset->drawSelection(pi_, x1, yo_);
e.inset->draw(pi_, x1, yo_);
- Dimension const & dim = pi_.base.bv->coordCache().insets().dim(e.inset);
-
- paintForeignMark(x_, e.font.language(), dim.descent());
-
- x_ += dim.width();
-
// Restore full_repaint status.
pi_.full_repaint = pi_full_repaint;
pi_.change_ = pi_change;
pi_.selected = pi_selected;
#ifdef DEBUG_METRICS
+ Dimension const & dim = pi_.base.bv->coordCache().insets().dim(e.inset);
int const x2 = x1 + dim.wid;
int const y1 = yo_ + dim.des;
int const y2 = yo_ - dim.asc;
}
-void RowPainter::paintForeignMark(double orig_x, Language const * lang, int desc) const
+void RowPainter::paintForeignMark(Row::Element const & e) const
{
+ Language const * lang = e.font.language();
if (!lyxrc.mark_foreign_language)
return;
if (lang == latex_language)
if (lang == pi_.base.bv->buffer().params().language)
return;
- int const y = yo_ + solid_line_offset_ + desc + solid_line_thickness_ / 2;
- pi_.pain.line(int(orig_x), y, int(x_), y, Color_language,
- Painter::line_solid, solid_line_thickness_);
+ int const desc = e.inset ? e.dim.descent() : 0;
+ int const y = yo_ + pi_.base.solidLineOffset()
+ + desc + pi_.base.solidLineThickness() / 2;
+ pi_.pain.line(int(x_), y, int(x_ + e.full_width()), y, Color_language,
+ Painter::line_solid, pi_.base.solidLineThickness());
}
-void RowPainter::paintMisspelledMark(double const orig_x,
- Row::Element const & e) const
+void RowPainter::paintMisspelledMark(Row::Element const & e) const
{
// if changed the misspelled marker gets placed slightly lower than normal
// to avoid drawing at the same vertical offset
FontMetrics const & fm = theFontMetrics(e.font);
int const thickness = max(fm.lineWidth(), 2);
- int const y = yo_ + solid_line_offset_ + solid_line_thickness_
- + (e.change.changed() ? solid_line_thickness_ + 1 : 0)
+ int const y = yo_ + pi_.base.solidLineOffset() + pi_.base.solidLineThickness()
+ + (e.change.changed() ? pi_.base.solidLineThickness() + 1 : 0)
+ 1 + thickness / 2;
//FIXME: this could be computed only once, it is probably not costly.
if (x1 > x2)
swap(x1, x2);
- pi_.pain.line(int(orig_x) + x1, y, int(orig_x) + x2, y,
+ pi_.pain.line(int(x_ + x1), y, int(x_ + x2), y,
Color_error,
Painter::line_onoffdash, thickness);
pos = range.last + 1;
}
-void RowPainter::paintStringAndSel(Row::Element const & e)
+void RowPainter::paintStringAndSel(Row::Element const & e) const
{
// at least part of text selected?
bool const some_sel = (e.endpos >= row_.sel_beg && e.pos < row_.sel_end)
min(row_.sel_end, e.endpos) - e.pos,
e.extra, e.full_width());
}
- x_ += e.full_width();
}
-void RowPainter::paintChange(double orig_x, Font const & font,
- Change const & change) const
+void RowPainter::paintChange(Row::Element const & e) const
{
- if (!change.changed())
- return;
- // Calculate 1/3 height of font
- FontMetrics const & fm = theFontMetrics(font);
- int const y_bar = change.deleted() ? yo_ - fm.maxAscent() / 3
- : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
- pi_.pain.line(int(orig_x), y_bar, int(x_), y_bar,
- change.color(), Painter::line_solid, solid_line_thickness_);
+ e.change.paintCue(pi_, x_, yo_, x_ + e.full_width(), e.font.fontInfo());
}
void RowPainter::paintChangeBar() const
{
- pos_type const start = row_.pos();
- pos_type end = row_.endpos();
-
- if (par_.size() == end) {
- // this is the last row of the paragraph;
- // thus, we must also consider the imaginary end-of-par character
- end++;
- }
-
- if (start == end || !par_.isChanged(start, end))
- return;
-
- int const height = text_metrics_.isLastRow(pit_, row_)
+ int const height = tm_.isLastRow(row_)
? row_.ascent()
: row_.height();
y += 2 * defaultRowHeight();
pi_.pain.line(1, y, 1, yo_ + row_.height(), Color_appendix);
- pi_.pain.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), Color_appendix);
+ pi_.pain.line(tm_.width() - 2, y, tm_.width() - 2, yo_ + row_.height(), Color_appendix);
}
return;
depth_type prev_depth = 0;
- if (!text_metrics_.isFirstRow(pit_, row_)) {
- pit_type pit2 = pit_;
+ if (!tm_.isFirstRow(row_)) {
+ pit_type pit2 = row_.pit();
if (row_.pos() == 0)
--pit2;
prev_depth = pars_[pit2].getDepth();
}
depth_type next_depth = 0;
- if (!text_metrics_.isLastRow(pit_, row_)) {
- pit_type pit2 = pit_;
+ if (!tm_.isLastRow(row_)) {
+ pit_type pit2 = row_.pit();
if (row_.endpos() >= pars_[pit2].size())
++pit2;
next_depth = pars_[pit2].getDepth();
docstring const label = _("Appendix");
theFontMetrics(pb_font).rectText(label, w, a, d);
- int const text_start = int(xo_ + (width_ - w) / 2);
+ int const text_start = int(xo_ + (tm_.width() - w) / 2);
int const text_end = text_start + w;
pi_.pain.rectText(text_start, y + d, label, pb_font, Color_none, Color_none);
pi_.pain.line(int(xo_ + 1), y, text_start, y, Color_appendix);
- pi_.pain.line(text_end, y, int(xo_ + width_ - 2), y, Color_appendix);
+ pi_.pain.line(text_end, y, int(xo_ + tm_.width() - 2), y, Color_appendix);
}
void RowPainter::paintTooLargeMarks(bool const left, bool const right) const
{
if (left)
- pi_.pain.line(dotted_line_thickness_, yo_ - row_.ascent(),
- dotted_line_thickness_, yo_ + row_.descent(),
- Color_scroll,
- Painter::line_onoffdash, dotted_line_thickness_);
+ pi_.pain.line(pi_.base.dottedLineThickness(), yo_ - row_.ascent(),
+ pi_.base.dottedLineThickness(), yo_ + row_.descent(),
+ Color_scroll, Painter::line_onoffdash,
+ pi_.base.dottedLineThickness());
if (right) {
- int const wwidth = pi_.base.bv->workWidth() - dotted_line_thickness_;
+ int const wwidth =
+ pi_.base.bv->workWidth() - pi_.base.dottedLineThickness();
pi_.pain.line(wwidth, yo_ - row_.ascent(),
wwidth, yo_ + row_.descent(),
- Color_scroll,
- Painter::line_onoffdash, dotted_line_thickness_);
+ Color_scroll, Painter::line_onoffdash,
+ pi_.base.dottedLineThickness());
}
}
paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
bool const is_first =
- text_.isFirstInSequence(pit_) || !layout.isParagraphGroup();
+ text_.isFirstInSequence(row_.pit()) || !layout.isParagraphGroup();
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
if (layout.labelIsInline()
void RowPainter::paintLabel() const
{
- docstring const str = par_.labelString();
+ docstring const & str = par_.labelString();
if (str.empty())
return;
- bool const is_rtl = text_.isRTL(par_);
Layout const & layout = par_.layout();
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
double x = x_;
- if (is_rtl)
- x = width_ - row_.right_margin + fm.width(layout.labelsep);
+ if (row_.isRTL())
+ x = tm_.width() - row_.right_margin + fm.width(layout.labelsep);
else
x = x_ - fm.width(layout.labelsep) - fm.width(str);
void RowPainter::paintTopLevelLabel() const
{
BufferParams const & bparams = pi_.base.bv->buffer().params();
- bool const is_rtl = text_.isRTL(par_);
ParagraphParameters const & pparams = par_.params();
Layout const & layout = par_.layout();
FontInfo const font = labelFont();
double x = x_;
if (layout.labeltype == LABEL_CENTERED) {
- x = row_.left_margin + (width_ - row_.left_margin - row_.right_margin) / 2;
+ x = row_.left_margin + (tm_.width() - row_.left_margin - row_.right_margin) / 2;
x -= fm.width(str) / 2;
- } else if (is_rtl) {
- x = width_ - row_.right_margin - fm.width(str);
+ } else if (row_.isRTL()) {
+ x = tm_.width() - row_.right_margin - fm.width(str);
}
pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
}
-void RowPainter::paintLast()
+void RowPainter::paintLast() const
{
- bool const is_rtl = text_.isRTL(par_);
- int const endlabel = getEndLabel(pit_, text_);
+ int const endlabel = getEndLabel(row_.pit(), text_);
// paint imaginary end-of-paragraph character
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
- int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
- int x = is_rtl ? nestMargin() + changebarMargin()
- : max_row_width - row_.right_margin;
// If needed, move the box a bit to avoid overlapping with text.
- int const rem = max_row_width - row_.width();
- if (rem <= 0)
- x += is_rtl ? rem : - rem;
+ int x = 0;
+ if (row_.isRTL()) {
+ int const normal_x = nestMargin() + changebarMargin();
+ x = min(normal_x, row_.left_margin - size - Inset::TEXT_TO_INSET_OFFSET);
+ } else {
+ int const normal_x = tm_.width() - row_.right_margin
+ - size - Inset::TEXT_TO_INSET_OFFSET;
+ x = max(normal_x, row_.width());
+ }
if (endlabel == END_LABEL_BOX)
pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout().endlabelstring();
- double const x = is_rtl ? x_ - fm.width(str) : x_;
+ double const x = row_.isRTL() ? x_ - fm.width(str) : x_;
pi_.pain.text(int(x), yo_, str, font);
break;
}
for ( ; cit != end ; ++cit) {
Row::Element const & e = *cit;
if (e.type == Row::INSET) {
- // If outer row has changed, nested insets are repainted completely.
- bool const nested_inset =
- (e.inset->asInsetMath() && !e.inset->asInsetMath()->asMacroTemplate())
- || e.inset->asInsetText() || e.inset->asInsetTabular();
- if (!nested_inset) {
- x_ += e.full_width();
- continue;
- }
paintInset(e);
- } else
- x_ += e.full_width();
+ // The line that indicates word in a different language
+ paintForeignMark(e);
+ // change tracking (not for insets that handle it themselves)
+ if (!e.inset->canPaintChange(*pi_.base.bv))
+ paintChange(e);
+ }
+
+ x_ += e.full_width();
}
}
Row::const_iterator cit = row_.begin();
Row::const_iterator const & end = row_.end();
for ( ; cit != end ; ++cit) {
- double const orig_x = x_;
Row::Element const & e = *cit;
- int foreign_descent = 0;
switch (e.type) {
case Row::STRING:
paintStringAndSel(e);
// Paint the spelling marks if enabled.
- if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && pi_.pain.isDrawingEnabled())
- paintMisspelledMark(orig_x, e);
+ if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && !pi_.pain.isNull())
+ paintMisspelledMark(e);
break;
- case Row::INSET: {
- // If outer row has changed, nested insets are repainted completely.
+
+ case Row::INSET:
paintInset(e);
- foreign_descent = e.dim.descent();
- }
break;
+
case Row::SPACE:
pi_.pain.textDecoration(e.font.fontInfo(), int(x_), yo_, int(e.full_width()));
- x_ += e.full_width();
}
// The line that indicates word in a different language
- paintForeignMark(orig_x, e.font.language(), foreign_descent);
+ paintForeignMark(e);
- // change tracking (not for insets that track their own changes)
- if (e.type != Row::INSET || ! e.inset->canTrackChanges())
- paintChange(orig_x, e.font, e.change);
+ // change tracking (not for insets that handle it themselves)
+ if (e.type != Row::INSET || ! e.inset->canPaintChange(*pi_.base.bv))
+ paintChange(e);
+
+ x_ += e.full_width();
}
}
{
if (!row_.selection())
return;
- Cursor const & curs = pi_.base.bv->cursor();
- DocIterator beg = curs.selectionBegin();
- beg.pit() = pit_;
- beg.pos() = row_.sel_beg;
-
- DocIterator end = curs.selectionEnd();
- end.pit() = pit_;
- end.pos() = row_.sel_end;
-
- bool const begin_boundary = beg.pos() >= row_.endpos();
- bool const end_boundary = row_.sel_end == row_.endpos();
-
- DocIterator cur = beg;
- cur.boundary(begin_boundary);
- int x1 = text_metrics_.cursorX(beg.top(), begin_boundary);
- int x2 = text_metrics_.cursorX(end.top(), end_boundary);
+
int const y1 = yo_ - row_.ascent();
int const y2 = y1 + row_.height();
- int const rm = text_.isMainText() ? pi_.base.bv->rightMargin() : 0;
- int const lm = text_.isMainText() ? pi_.base.bv->leftMargin() : 0;
-
// draw the margins
- if (row_.begin_margin_sel) {
- if (text_.isRTL(beg.paragraph())) {
- pi_.pain.fillRectangle(int(xo_ + x1), y1,
- text_metrics_.width() - rm - x1, y2 - y1, Color_selection);
- } else {
- pi_.pain.fillRectangle(int(xo_ + lm), y1, x1 - lm, y2 - y1,
- Color_selection);
- }
- }
-
- if (row_.end_margin_sel) {
- if (text_.isRTL(beg.paragraph())) {
- pi_.pain.fillRectangle(int(xo_ + lm), y1, x2 - lm, y2 - y1,
- Color_selection);
- } else {
- pi_.pain.fillRectangle(int(xo_ + x2), y1, text_metrics_.width() - rm - 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);
+ if (row_.isRTL() ? row_.end_margin_sel : row_.begin_margin_sel)
+ pi_.pain.fillRectangle(int(xo_), y1, row_.left_margin, y2 - y1,
+ Color_selection);
// go through row and draw from RTL boundary to RTL boundary
- 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());
+ double x = xo_ + row_.left_margin;
+ for (auto const & e : row_) {
+ // These are the same tests as in paintStringAndSel, except
+ // that all_sel has an additional clause that triggers for end
+ // of paragraph markers. The clause was not used in
+ // paintStringAndSel to avoid changing the drawing color.
+ // 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)
+ || (e.isVirtual() && e.pos == row_.endpos() && row_.end_margin_sel)
+ || pi_.selected;
+
+ if (all_sel) {
+ // the 3rd argument is written like that to avoid rounding issues
+ pi_.pain.fillRectangle(int(x), y1,
+ int(x + e.full_width()) - int(x), 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);
+ double x1 = e.pos2x(from);
+ double x2 = e.pos2x(to);
+ if (x1 > x2)
+ swap(x1, x2);
+ // the 3rd argument is written like that to avoid rounding issues
+ pi_.pain.fillRectangle(int(x + x1), y1, int(x2 + x) - int(x1 + x),
+ y2 - y1, Color_selection);
}
+ x += e.full_width();
+ }
- 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);
+ if (row_.isRTL() ? row_.begin_margin_sel : row_.end_margin_sel)
+ pi_.pain.fillRectangle(int(x), y1,
+ int(xo_ + tm_.width()) - int(x), 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;
- }
- }
}
projects / lyx.git / blobdiff