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), dotted_line_offset_(2)
+ dotted_line_thickness_(1)
{
- bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
-
if (lyxrc.zoom >= 200) {
// derive the line thickness from zoom factor
// the zoom is given in percent
// the zoom is given in percent
// (increase thickness at 150%, 250% etc.)
dotted_line_thickness_ = (lyxrc.zoom + 50) / 100;
- // adjust line_offset_ too
- dotted_line_offset_ = 1 + dotted_line_thickness_ / 2;
}
x_ = row_.left_margin + xo_;
}
-int RowPainter::leftMargin() const
-{
- return text_metrics_.leftMargin(text_metrics_.width(), pit_,
- row_.pos());
-}
-
// If you want to debug inset metrics uncomment the following line:
//#define DEBUG_METRICS
// This draws green lines around each inset.
-void RowPainter::paintInset(Inset const * inset, pos_type const pos)
+void RowPainter::paintInset(Row::Element const & e)
{
// Handle selection
bool const pi_selected = pi_.selected;
Cursor const & cur = pi_.base.bv->cursor();
if (cur.selection() && cur.text() == &text_
&& cur.normalAnchor().text() == &text_)
- pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
-
- Font const font = text_metrics_.displayFont(pit_, pos);
+ pi_.selected = row_.sel_beg <= e.pos && row_.sel_end > e.pos;
- LASSERT(inset, return);
+ LASSERT(e.inset, return);
// Backup full_repaint status because some insets (InsetTabular)
// requires a full repaint
bool const pi_full_repaint = pi_.full_repaint;
bool const pi_do_spellcheck = pi_.do_spellcheck;
+ Change const pi_change = pi_.change_;
- pi_.base.font = inset->inheritFont() ? font.fontInfo() :
+ pi_.base.font = e.inset->inheritFont() ? e.font.fontInfo() :
pi_.base.bv->buffer().params().getFont().fontInfo();
- pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
- Change prev_change = change_;
- pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos);
- pi_.do_spellcheck &= inset->allowSpellCheck();
+ pi_.ltr_pos = !e.font.isVisibleRightToLeft();
+ pi_.change_ = change_.changed() ? change_ : e.change;
+ pi_.do_spellcheck &= e.inset->allowSpellCheck();
int const x1 = int(x_);
- pi_.base.bv->coordCache().insets().add(inset, x1, yo_);
+ pi_.base.bv->coordCache().insets().add(e.inset, x1, yo_);
// insets are painted completely. Recursive
// FIXME: it is wrong to completely paint the background
// if we want to do single row painting.
- inset->drawBackground(pi_, x1, yo_);
- inset->drawSelection(pi_, x1, yo_);
- inset->draw(pi_, x1, yo_);
+ e.inset->drawBackground(pi_, x1, yo_);
+ e.inset->drawSelection(pi_, x1, yo_);
+ e.inset->draw(pi_, x1, yo_);
- Dimension const & dim = pm_.insetDimension(inset);
+ Dimension const & dim = pi_.base.bv->coordCache().insets().dim(e.inset);
- paintForeignMark(x_, font.language(), dim.descent());
+ paintForeignMark(x_, e.font.language(), dim.descent());
x_ += dim.width();
// Restore full_repaint status.
pi_.full_repaint = pi_full_repaint;
- pi_.change_ = prev_change;
+ pi_.change_ = pi_change;
pi_.do_spellcheck = pi_do_spellcheck;
pi_.selected = pi_selected;
}
-void RowPainter::paintSeparator(double width, Font const & font)
-{
- pi_.pain.textDecoration(font.fontInfo(), int(x_), yo_, int(width));
- x_ += width;
-}
-
-
void RowPainter::paintForeignMark(double orig_x, Language const * lang, int desc) const
{
if (!lyxrc.mark_foreign_language)
void RowPainter::paintMisspelledMark(double const orig_x,
- docstring const & str, Font const & font,
- pos_type const start_pos,
- bool const changed) const
+ 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_
- + (changed ? solid_line_thickness_ + 1 : 0)
- + dotted_line_offset_;
+ + (e.change.changed() ? solid_line_thickness_ + 1 : 0)
+ + 1 + thickness / 2;
//FIXME: this could be computed only once, it is probably not costly.
// check for cursor position
--cpos;
}
- pos_type pos = start_pos;
- while (pos < start_pos + pos_type(str.length())) {
+ pos_type pos = e.pos;
+ while (pos < e.pos + pos_type(e.str.length())) {
if (!par_.isMisspelled(pos)) {
++pos;
continue;
continue;
}
- FontMetrics const & fm = theFontMetrics(font);
- int x1 = fm.pos2x(str, range.first - start_pos,
- font.isVisibleRightToLeft());
- int x2 = fm.pos2x(str, min(range.last - start_pos + 1,
- pos_type(str.length())),
- font.isVisibleRightToLeft());
+ FontMetrics const & fm = theFontMetrics(e.font);
+ int x1 = fm.pos2x(e.str, range.first - e.pos,
+ e.isRTL(), e.extra);
+ int x2 = fm.pos2x(e.str, min(range.last - e.pos + 1,
+ pos_type(e.str.length())),
+ e.isRTL(), e.extra);
if (x1 > x2)
swap(x1, x2);
pi_.pain.line(int(orig_x) + x1, y, int(orig_x) + x2, y,
Color_error,
- Painter::line_onoffdash, dotted_line_thickness_);
+ Painter::line_onoffdash, thickness);
pos = range.last + 1;
}
}
-void RowPainter::paintStringAndSel(docstring const & str, Font const & font,
- Change const & change,
- pos_type start_pos, pos_type end_pos)
+void RowPainter::paintStringAndSel(Row::Element const & e)
{
// at least part of text selected?
- bool const some_sel = (end_pos >= row_.sel_beg && start_pos < row_.sel_end)
+ bool const some_sel = (e.endpos >= row_.sel_beg && e.pos < row_.sel_end)
|| pi_.selected;
// all the text selected?
- bool const all_sel = (start_pos >= row_.sel_beg && end_pos < row_.sel_end)
+ bool const all_sel = (e.pos >= row_.sel_beg && e.endpos < row_.sel_end)
|| pi_.selected;
- if (all_sel) {
- Font copy = font;
- copy.fontInfo().setPaintColor(Color_selectiontext);
- x_ += pi_.pain.text(int(x_), yo_, str, copy);
- } else if (change.changed()) {
- Font copy = font;
- copy.fontInfo().setPaintColor(change.color());
- x_ += pi_.pain.text(int(x_), yo_, str, copy);
+ if (all_sel || e.change.changed()) {
+ Font copy = e.font;
+ Color const col = e.change.changed() ? e.change.color()
+ : Color_selectiontext;
+ copy.fontInfo().setPaintColor(col);
+ pi_.pain.text(int(x_), yo_, e.str, copy, e.extra, e.full_width());
} else if (!some_sel) {
- x_ += pi_.pain.text(int(x_), yo_, str, font);
+ pi_.pain.text(int(x_), yo_, e.str, e.font, e.extra, e.full_width());
} else {
- x_ += pi_.pain.text(int(x_), yo_, str, font, Color_selectiontext,
- max(row_.sel_beg, start_pos) - start_pos,
- min(row_.sel_end, end_pos) - start_pos);
+ pi_.pain.text(int(x_), yo_, e.str, e.font, Color_selectiontext,
+ max(row_.sel_beg, e.pos) - e.pos,
+ min(row_.sel_end, e.endpos) - e.pos,
+ e.extra, e.full_width());
}
+ x_ += e.full_width();
}
}
-void RowPainter::paintFromPos(pos_type & vpos, bool changed)
-{
- pos_type pos = bidi_.vis2log(vpos);
- pos_type start_pos = pos;
- // first character
- docstring str;
- str.reserve(100);
- char_type const c = par_.getChar(pos);
- str.push_back(c);
-
- double const orig_x = x_;
-
- Font const font = text_metrics_.displayFont(pit_, pos);
- FontSpan const font_span = par_.fontSpan(pos);
- // Track-change status.
- Change const & change_running = par_.lookupChange(pos);
-
- // collect as much similar chars as we can
- pos_type const end = row_.endpos();
- for (++vpos ; vpos < end ; ++vpos) {
- pos = bidi_.vis2log(vpos);
-
- if (!font_span.contains(pos))
- break;
-
- Change const & change = par_.lookupChange(pos);
- if (!change_running.isSimilarTo(change))
- // Track change type or author has changed.
- break;
-
- char_type const c = par_.getChar(pos);
-
- if (c == '\t')
- break;
-
- if (!isPrintableNonspace(c))
- break;
-
- str.push_back(c);
- }
-
- // Make pos point to the last character in the string.
- // Using "pos = bidi_.vis2log(vpos)" does not work for some reason.
- if (vpos < end)
- pos = bidi_.vis2log(vpos - 1);
-
- // Now make pos point to the position _after_ the string.
- // Using vis2log for that is not a good idea in general, we
- // want logical ordering.
- if (font.isVisibleRightToLeft())
- --pos;
- else
- ++pos;
-
- if (str[0] == '\t')
- str.replace(0,1,from_ascii(" "));
-
- /* Because we do our own bidi, at this point the strings are
- * already in visual order. However, Qt also applies its own
- * bidi algorithm to strings that it paints to the screen.
- * Therefore, if we were to paint Hebrew/Arabic words as a
- * single string, the letters in the words would get reversed
- * again. In order to avoid that, we reverse our string.
- * See also http://thread.gmane.org/gmane.editors.lyx.devel/79740
- * for an earlier thread on the subject
- */
- if (font.isVisibleRightToLeft()) {
- reverse(str.begin(), str.end());
- // If the string is reversed, the positions need to be adjusted
- ++pos;
- ++start_pos;
- swap(start_pos, pos);
- }
-
- // Actually paint the text, taking care about the selection
- paintStringAndSel(str, font, change_running, start_pos, pos);
-
- // The line that indicates word in a different language
- paintForeignMark(orig_x, font.language());
-
- // Paint the spelling mark if needed.
- if (lyxrc.spellcheck_continuously && pi_.do_spellcheck
- && par_.isMisspelled(start_pos)) {
- paintMisspelledMark(orig_x, str, font, start_pos, changed);
- }
-}
-
-
void RowPainter::paintChangeBar() const
{
pos_type const start = row_.pos();
}
-int RowPainter::paintAppendixStart(int y) const
+void RowPainter::paintAppendixStart(int y) const
{
FontInfo pb_font = sane_font;
pb_font.setColor(Color_appendix);
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);
-
- return 3 * defaultRowHeight();
}
void RowPainter::paintFirst() const
{
- BufferParams const & bparams = pi_.base.bv->buffer().params();
Layout const & layout = par_.layout();
- int y_top = 0;
-
// start of appendix?
if (par_.params().startOfAppendix())
- y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
-
- if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
- && pit_ != 0) {
- if (layout.latextype == LATEX_PARAGRAPH
- && !par_.getDepth()) {
- y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
- } else {
- Layout const & playout = pars_[pit_ - 1].layout();
- if (playout.latextype == LATEX_PARAGRAPH
- && !pars_[pit_ - 1].getDepth()) {
- // is it right to use defskip here, too? (AS)
- y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
- }
- }
- }
+ paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
bool const is_first =
text_.isFirstInSequence(pit_) || !layout.isParagraphGroup();
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
if (layout.labelIsInline()
- && (layout.labeltype != LABEL_STATIC || is_first)) {
+ && (layout.labeltype != LABEL_STATIC || is_first))
paintLabel();
- } else if (is_first && layout.labelIsAbove()) {
+ else if (is_first && layout.labelIsAbove())
paintTopLevelLabel();
- }
}
FontMetrics const & fm = theFontMetrics(font);
double x = x_;
- if (is_rtl) {
- x = width_ - leftMargin()
- + fm.width(layout.labelsep);
- } else {
- x = x_ - fm.width(layout.labelsep)
- - fm.width(str);
- }
+ if (is_rtl)
+ x = width_ - row_.right_margin + fm.width(layout.labelsep);
+ else
+ x = x_ - fm.width(layout.labelsep) - fm.width(str);
pi_.pain.text(int(x), yo_, str, font);
}
double x = x_;
if (layout.labeltype == LABEL_CENTERED) {
- if (is_rtl)
- x = leftMargin();
- x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
+ x = row_.left_margin + (width_ - row_.left_margin - row_.right_margin) / 2;
x -= fm.width(str) / 2;
} else if (is_rtl) {
- x = width_ - leftMargin() - fm.width(str);
+ x = width_ - row_.right_margin - fm.width(str);
}
pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
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 - text_metrics_.rightMargin(pm_);
+ : 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();
void RowPainter::paintOnlyInsets()
{
- CoordCache const & cache = pi_.base.bv->coordCache();
- pos_type const end = row_.endpos();
- for (pos_type pos = row_.pos(); pos != end; ++pos) {
- // If outer row has changed, nested insets are repaint completely.
- Inset const * inset = par_.getInset(pos);
- bool const nested_inset = inset &&
- ((inset->asInsetMath() &&
- !inset->asInsetMath()->asMacroTemplate())
- || inset->asInsetText()
- || inset->asInsetTabular());
- if (!nested_inset)
- continue;
- if (x_ > pi_.base.bv->workWidth()
- || !cache.getInsets().has(inset))
- continue;
- x_ = cache.getInsets().x(inset);
- paintInset(inset, pos);
+ Row::const_iterator cit = row_.begin();
+ Row::const_iterator const & end = row_.end();
+ 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();
}
}
+
void RowPainter::paintText()
{
Row::const_iterator cit = row_.begin();
switch (e.type) {
case Row::STRING:
case Row::VIRTUAL:
- paintStringAndSel(e.str, e.font, e.change, e.pos, e.endpos);
+ paintStringAndSel(e);
- // Paint the spelling mark if needed.
- if (lyxrc.spellcheck_continuously && pi_.do_spellcheck
- && par_.isMisspelled(e.pos)) {
- paintMisspelledMark(orig_x, e.str, e.font, e.pos, e.change.changed());
- }
+ // Paint the spelling marks if enabled.
+ if (lyxrc.spellcheck_continuously && pi_.do_spellcheck && pi_.pain.isDrawingEnabled())
+ paintMisspelledMark(orig_x, e);
break;
case Row::INSET: {
- // If outer row has changed, nested insets are repaint completely.
- pi_.base.bv->coordCache().insets().add(e.inset, int(x_), yo_);
- paintInset(e.inset, e.pos);
+ // If outer row has changed, nested insets are repainted completely.
+ paintInset(e);
foreign_descent = e.dim.descent();
}
break;
- case Row::SEPARATOR:
case Row::SPACE:
- paintSeparator(e.full_width(), e.font);
+ 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
if (e.type != Row::INSET || ! e.inset->canTrackChanges())
paintChange(orig_x, e.font, e.change);
}
-
-#if 0
- x_ = row_.left_margin + xo_;
- paintText2();
-#endif
-}
-
-
-void RowPainter::paintText2()
-{
- //LYXERR0("-------------------------------------------------------");
- pos_type const end = row_.endpos();
- // Spaces at logical line breaks in bidi text must be skipped during
- // painting. However, they may appear visually in the middle
- // of a row; they must be skipped, wherever they are...
- // * logically "abc_[HEBREW_\nHEBREW]"
- // * visually "abc_[_WERBEH\nWERBEH]"
- pos_type skipped_sep_vpos = -1;
- pos_type body_pos = par_.beginOfBody();
- if (body_pos > 0 &&
- (body_pos > end || !par_.isLineSeparator(body_pos - 1))) {
- body_pos = 0;
- }
-
- Layout const & layout = par_.layout();
-
- Change change_running;
- int change_last_x = 0;
-
- // check for possible inline completion
- DocIterator const & inlineCompletionPos = pi_.base.bv->inlineCompletionPos();
- pos_type inlineCompletionVPos = -1;
- if (inlineCompletionPos.inTexted()
- && inlineCompletionPos.text() == &text_
- && inlineCompletionPos.pit() == pit_
- && inlineCompletionPos.pos() - 1 >= row_.pos()
- && inlineCompletionPos.pos() - 1 < row_.endpos()) {
- // draw logically behind the previous character
- inlineCompletionVPos = bidi_.log2vis(inlineCompletionPos.pos() - 1);
- }
-
- // Use font span to speed things up, see below
- FontSpan font_span;
- Font font;
-
- // If the last logical character is a separator, don't paint it, unless
- // it's in the last row of a paragraph; see skipped_sep_vpos declaration
- if (end > 0 && end < par_.size() && par_.isSeparator(end - 1))
- skipped_sep_vpos = bidi_.log2vis(end - 1);
-
- for (pos_type vpos = row_.pos(); vpos < end; ) {
- if (x_ > pi_.base.bv->workWidth())
- break;
-
- // Skip the separator at the logical end of the row
- if (vpos == skipped_sep_vpos) {
- ++vpos;
- continue;
- }
-
- pos_type const pos = bidi_.vis2log(vpos);
-
- if (pos >= par_.size()) {
- ++vpos;
- continue;
- }
-
- // Use font span to speed things up, see above
- if (!font_span.contains(pos)) {
- font_span = par_.fontSpan(pos);
- font = text_metrics_.displayFont(pit_, pos);
-
- // split font span if inline completion is inside
- if (inlineCompletionVPos != -1
- && font_span.contains(inlineCompletionPos.pos()))
- font_span.last = inlineCompletionPos.pos();
- }
-
- // Note that this value will only be used in
- // situations where no ligature of composition of
- // characters is needed. (see comments in uses of width_pos).
- const int width_pos = pm_.singleWidth(pos, font);
-
- Change const & change = par_.lookupChange(pos);
- if (change.changed() && !change_running.changed()) {
- change_running = change;
- change_last_x = int(x_);
- }
-
- Inset const * inset = par_.getInset(pos);
- bool const highly_editable_inset = inset
- && inset->editable();
-
- // If we reach the end of a change or if the author changes, paint it.
- // We also don't paint across things like tables
- if (change_running.changed() && (highly_editable_inset
- || !change.changed() || !change_running.isSimilarTo(change))) {
- // Calculate 1/3 height of the buffer's default font
- FontMetrics const & fm
- = theFontMetrics(pi_.base.bv->buffer().params().getFont());
- int const y_bar = change_running.deleted() ?
- yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
- pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, solid_line_thickness_);
-
- // Change might continue with a different author or type
- if (change.changed() && !highly_editable_inset) {
- change_running = change;
- change_last_x = int(x_);
- } else
- change_running.setUnchanged();
- }
-
- if (body_pos > 0 && pos == body_pos - 1) {
- int const lwidth = theFontMetrics(labelFont())
- .width(layout.labelsep);
-
- // width_pos is either the width of a space or an inset
- x_ += row_.label_hfill + lwidth - width_pos;
- }
-
- // Is the inline completion in front of character?
- if (font.isRightToLeft() && vpos == inlineCompletionVPos)
- paintInlineCompletion(font);
-
- if (par_.isSeparator(pos)) {
- Font const orig_font = text_metrics_.displayFont(pit_, pos);
- double const orig_x = x_;
- // width_pos is the width of a space
- double separator_width = width_pos;
- if (pos >= body_pos)
- separator_width += row_.separator;
- paintSeparator(separator_width, orig_font);
- paintForeignMark(orig_x, orig_font.language());
- ++vpos;
-
- } else if (inset) {
- // If outer row has changed, nested insets are repaint completely.
- pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
- paintInset(inset, pos);
- ++vpos;
-
- } else {
- // paint as many characters as possible.
- paintFromPos(vpos, change_running.changed());
- }
-
- // Is the inline completion after character?
- if (!font.isRightToLeft() && vpos - 1 == inlineCompletionVPos)
- paintInlineCompletion(font);
- }
-
- // if we reach the end of a struck out range, paint it
- if (change_running.changed()) {
- FontMetrics const & fm
- = theFontMetrics(pi_.base.bv->buffer().params().getFont());
- int const y_bar = change_running.deleted() ?
- yo_ - fm.maxAscent() / 3 : yo_ + 2 * solid_line_offset_ + solid_line_thickness_;
- pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, solid_line_thickness_);
- change_running.setUnchanged();
- }
}
}
-void RowPainter::paintInlineCompletion(Font const & font)
-{
- docstring completion = pi_.base.bv->inlineCompletion();
- FontInfo f = font.fontInfo();
- bool rtl = font.isRightToLeft();
-
- // draw the unique and the non-unique completion part
- // Note: this is not time-critical as it is
- // only done once per screen.
- size_t uniqueTo = pi_.base.bv->inlineCompletionUniqueChars();
- docstring s1 = completion.substr(0, uniqueTo);
- docstring s2 = completion.substr(uniqueTo);
- ColorCode c1 = Color_inlinecompletion;
- ColorCode c2 = Color_nonunique_inlinecompletion;
-
- // right to left?
- if (rtl) {
- swap(s1, s2);
- swap(c1, c2);
- }
-
- if (!s1.empty()) {
- f.setColor(c1);
- pi_.pain.text(int(x_), yo_, s1, f);
- x_ += theFontMetrics(font).width(s1);
- }
-
- if (!s2.empty()) {
- f.setColor(c2);
- pi_.pain.text(int(x_), yo_, s2, f);
- x_ += theFontMetrics(font).width(s2);
- }
-}
-
} // namespace lyx
projects / lyx.git / blobdiff