#include "MetricsInfo.h"
#include "Paragraph.h"
#include "ParagraphMetrics.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "TextMetrics.h"
#include "VSpace.h"
FontInfo RowPainter::labelFont() const
{
- return text_.labelFont(pi_.base.bv->buffer(), par_);
+ FontInfo f = text_.labelFont(par_);
+ // selected text?
+ if (row_.begin_margin_sel || pi_.selected)
+ f.setPaintColor(Color_selectiontext);
+ return f;
}
int const x1 = int(x_);
pi_.base.bv->coordCache().insets().add(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_);
Change const & change_running = par_.lookupChange(pos);
// selected text?
- bool const selection = pos >= row_.sel_beg && pos < row_.sel_end;
+ bool const selection = (pos >= row_.sel_beg && pos < row_.sel_end)
+ || pi_.selected;
+
+ // spelling correct?
+ bool const spell_state =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
- char_type prev_char = ' ';
+ char_type prev_char = 0;
// collect as much similar chars as we can
for (++vpos ; vpos < end ; ++vpos) {
pos = bidi_.vis2log(vpos);
// Selection ends or starts here.
break;
+ bool const new_spell_state =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
+ if (new_spell_state != spell_state)
+ // Spell checker state changed here.
+ break;
+
Change const & change = par_.lookupChange(pos);
if (!change_running.isSimilarTo(change))
// Track change type or author has changed.
char_type c = par_.getChar(pos);
- if (c == '\t' || prev_char == '\t') {
- prev_char = c;
+ if (c == '\t')
break;
- }
if (!isPrintableNonspace(c))
break;
+ // Work-around bug #6920
+ // The bug can be reproduced with DejaVu font under Linux.
+ // The issue is that we compute the metrics character by character
+ // in ParagraphMetrics::singleWidth(); but we paint word by word
+ // for performance reason.
+ // Maybe a more general fix would be draw character by character
+ // for some predefined fonts on some platform. In arabic and
+ // Hebrew we already do paint this way.
+ if (prev_char == 'f')
+ break;
+
/* 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.
}
str.push_back(c);
+ prev_char = c;
}
docstring s(&str[0], str.size());
x_ += pi_.pain.text(int(x_), yo_, s, font);
return;
}
-
+
FontInfo copy = font;
if (change_running.changed())
copy.setPaintColor(change_running.color());
}
-void RowPainter::paintMisspelledMark(double orig_x, int desc)
+void RowPainter::paintMisspelledMark(double orig_x, int desc, bool changed)
{
- int const y = yo_ + desc;
- pi_.pain.wavyHorizontalLine(int(orig_x), y, int(x_) - int(orig_x), Color_red);
+ // derive the offset from zoom factor specified by user in percent
+ // if changed the misspelled marker gets placed slightly lower than normal
+ // to avoid drawing at the same vertical offset
+ int const offset = int(1.5 * lyxrc.zoom / 100.0); // [percent]
+ int const y = yo_ + desc + (changed ? offset : 0);
+ pi_.pain.line(int(orig_x), y, int(x_), y, Color_red, Painter::line_onoffdash, 1.0);
}
-void RowPainter::paintFromPos(pos_type & vpos)
+void RowPainter::paintFromPos(pos_type & vpos, bool changed)
{
pos_type const pos = bidi_.vis2log(vpos);
Font const orig_font = text_metrics_.displayFont(pit_, pos);
// special case languages
string const & lang = orig_font.language()->lang();
bool const hebrew = lang == "hebrew";
- bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" ||
+ bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" ||
lang == "farsi";
+ // spelling correct?
+ bool const misspelled_ =
+ lyxrc.spellcheck_continuously && par_.isMisspelled(pos);
+
// draw as many chars as we can
if ((!hebrew && !arabic)
|| (hebrew && !Encodings::isHebrewComposeChar(c))
paintForeignMark(orig_x, orig_font.language());
- if (orig_font.isMisspelled())
- paintMisspelledMark(orig_x, 3);
+ if (lyxrc.spellcheck_continuously && misspelled_) {
+ paintMisspelledMark(orig_x, 2, changed);
+ }
}
void RowPainter::paintAppendix()
{
// only draw the appendix frame once (for the main text)
- if (!par_.params().appendix() || !text_.isMainText(pi_.base.bv->buffer()))
+ if (!par_.params().appendix() || !text_.isMainText())
return;
int y = yo_ - row_.ascent();
int const w = nestMargin() / 5;
int x = int(xo_) + w * i;
// only consider the changebar space if we're drawing outermost text
- if (text_.isMainText(pi_.base.bv->buffer()))
+ if (text_.isMainText())
x += changebarMargin();
int const starty = yo_ - row_.ascent();
void RowPainter::paintFirst()
{
- ParagraphParameters const & parparams = par_.params();
+ ParagraphParameters const & pparams = par_.params();
+ Buffer const & buffer = pi_.base.bv->buffer();
+ BufferParams const & bparams = buffer.params();
+ Layout const & layout = par_.layout();
int y_top = 0;
// start of appendix?
- if (parparams.startOfAppendix())
+ if (pparams.startOfAppendix())
y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
- Buffer const & buffer = pi_.base.bv->buffer();
- Layout const & layout = par_.layout();
-
- if (buffer.params().paragraph_separation == BufferParams::ParagraphSkipSeparation) {
- if (pit_ != 0) {
- if (layout.latextype == LATEX_PARAGRAPH
- && !par_.getDepth()) {
- y_top += buffer.params().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 += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
- }
+ 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);
}
}
}
- bool const is_rtl = text_.isRTL(buffer, par_);
- bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
+ bool const is_rtl = text_.isRTL(par_);
+ bool const is_seq = text_.isFirstInSequence(pit_);
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
// should we print a label?
// the top.
if (layout.counter == "chapter") {
double spacing_val = 1.0;
- if (!parparams.spacing().isDefault()) {
- spacing_val = parparams.spacing().getValue();
+ if (!pparams.spacing().isDefault()) {
+ spacing_val = pparams.spacing().getValue();
} else {
- spacing_val = buffer.params().spacing().getValue();
+ spacing_val = bparams.spacing().getValue();
}
int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val);
docstring const str = par_.labelString();
if (!str.empty()) {
double spacing_val = 1.0;
- if (!parparams.spacing().isDefault())
- spacing_val = parparams.spacing().getValue();
+ if (!pparams.spacing().isDefault())
+ spacing_val = pparams.spacing().getValue();
else
- spacing_val = buffer.params().spacing().getValue();
+ spacing_val = bparams.spacing().getValue();
FontMetrics const & fm = theFontMetrics(font);
}
+/** Check if the current paragraph is the last paragraph in a
+ proof environment */
+static int getEndLabel(pit_type p, Text const & text)
+{
+ ParagraphList const & pars = text.paragraphs();
+ pit_type pit = p;
+ depth_type par_depth = pars[p].getDepth();
+ while (pit != pit_type(pars.size())) {
+ Layout const & layout = pars[pit].layout();
+ int const endlabeltype = layout.endlabeltype;
+
+ if (endlabeltype != END_LABEL_NO_LABEL) {
+ if (p + 1 == pit_type(pars.size()))
+ return endlabeltype;
+
+ depth_type const next_depth =
+ pars[p + 1].getDepth();
+ if (par_depth > next_depth ||
+ (par_depth == next_depth && layout != pars[p + 1].layout()))
+ return endlabeltype;
+ break;
+ }
+ if (par_depth == 0)
+ break;
+ pit = text.outerHook(pit);
+ if (pit != pit_type(pars.size()))
+ par_depth = pars[pit].getDepth();
+ }
+ return END_LABEL_NO_LABEL;
+}
+
+
void RowPainter::paintLast()
{
- bool const is_rtl = text_.isRTL(pi_.base.bv->buffer(), par_);
- int const endlabel = getEndLabel(pit_, text_.paragraphs());
+ bool const is_rtl = text_.isRTL(par_);
+ int const endlabel = getEndLabel(pit_, text_);
// paint imaginary end-of-paragraph character
Color col = change.color();
pi_.pain.line(int(x_) + 1, yo_ + 2, int(x_) + 1, yo_ + 2 - length, col,
- Painter::line_solid, Painter::line_thick);
+ Painter::line_solid, 3);
if (change.deleted()) {
pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1 + length,
- yo_ + 2, col, Painter::line_solid, Painter::line_thick);
+ yo_ + 2, col, Painter::line_solid, 3);
} else {
pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1,
- yo_ + 2, col, Painter::line_solid, Painter::line_thick);
+ yo_ + 2, col, Painter::line_solid, 3);
}
-
}
// draw an endlabel
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout().endlabelstring();
- double const x = is_rtl ?
- x_ - fm.width(str)
- : - text_metrics_.rightMargin(pm_) - row_.width();
+ double const x = is_rtl ? x_ - fm.width(str) : x_;
pi_.pain.text(int(x), yo_, str, font);
break;
}
case END_LABEL_NO_LABEL:
+ if (lyxrc.paragraph_markers && size_type(pit_ + 1) < pars_.size()) {
+ docstring const s = docstring(1, char_type(0x00B6));
+ FontInfo f = FontInfo();
+ FontMetrics const & fm = theFontMetrics(f);
+ f.setColor(Color_paragraphmarker);
+ pi_.pain.text(int(x_), yo_, s, f);
+ x_ += fm.width(s);
+ }
break;
}
}
Inset const * inset = par_.getInset(pos);
if (!inset)
continue;
- if (x_ > pi_.base.bv->workWidth()
+ if (x_ > pi_.base.bv->workWidth()
|| !cache.getInsets().has(inset))
continue;
x_ = cache.getInsets().x(inset);
bool const pi_selected = pi_.selected;
Cursor const & cur = pi_.base.bv->cursor();
- if (cur.selection() && cur.text() == &text_
- && cur.anchor().text() == &text_)
- pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
+ if (cur.selection() && cur.text() == &text_
+ && cur.normalAnchor().text() == &text_)
+ pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
paintInset(inset, pos);
pi_.selected = pi_selected;
}
void RowPainter::paintText()
{
pos_type const end = row_.endpos();
- // Spaces at logical line breaks in bidi text must be skipped during
+ // 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]"
int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid,
- Painter::line_thin);
+ change_running.color(), Painter::line_solid, 0.5);
// Change might continue with a different author or type
if (change.changed() && !highly_editable_inset) {
x_ += row_.label_hfill + lwidth - width_pos;
}
-
+
// Is the inline completion in front of character?
if (font.isRightToLeft() && vpos == inlineCompletionVPos)
paintInlineCompletion(font);
} else if (inset) {
// If outer row has changed, nested insets are repaint completely.
pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
-
+
bool const pi_selected = pi_.selected;
Cursor const & cur = pi_.base.bv->cursor();
- if (cur.selection() && cur.text() == &text_
- && cur.anchor().text() == &text_)
- pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
+ if (cur.selection() && cur.text() == &text_
+ && cur.normalAnchor().text() == &text_)
+ pi_.selected = row_.sel_beg <= pos && row_.sel_end > pos;
paintInset(inset, pos);
pi_.selected = pi_selected;
++vpos;
} else {
// paint as many characters as possible.
- paintFromPos(vpos);
+ paintFromPos(vpos, change_running.changed());
}
// Is the inline completion after character?
int const y_bar = change_running.deleted() ?
yo_ - fm.maxAscent() / 3 : yo_ + fm.maxAscent() / 6;
pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
- change_running.color(), Painter::line_solid, Painter::line_thin);
+ change_running.color(), Painter::line_solid, 0.5);
change_running.setUnchanged();
}
}
+void RowPainter::paintSelection()
+{
+ 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(xo_ + x1, y1, text_metrics_.width() - rm - x1, y2 - y1,
+ Color_selection);
+ } else {
+ pi_.pain.fillRectangle(xo_ + lm, y1, x1 - lm, y2 - y1,
+ Color_selection);
+ }
+ }
+
+ if (row_.end_margin_sel) {
+ if (text_.isRTL(beg.paragraph())) {
+ pi_.pain.fillRectangle(xo_ + lm, y1, x2 - lm, y2 - y1,
+ Color_selection);
+ } else {
+ pi_.pain.fillRectangle(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);
+
+ // 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());
+ }
+
+ if (!(cur < end) || draw_now) {
+ x2 = text_metrics_.cursorX(cur.top(), cur.boundary());
+ pi_.pain.fillRectangle(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;
+ }
+ }
+}
+
+
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.
docstring s2 = completion.substr(uniqueTo);
ColorCode c1 = Color_inlinecompletion;
ColorCode c2 = Color_nonunique_inlinecompletion;
-
+
// right to left?
if (rtl) {
swap(s1, s2);
pi_.pain.text(int(x_), yo_, s1, f);
x_ += theFontMetrics(font).width(s1);
}
-
+
if (s2.size() > 0) {
f.setColor(c2);
pi_.pain.text(int(x_), yo_, s2, f);