*/
#include <config.h>
+#include <algorithm>
#include "rowpainter.h"
#include "support/debug.h"
#include "support/textutils.h"
+#include "support/lassert.h"
#include <boost/crc.hpp>
-#include <ostream>
-
using namespace std;
namespace lyx {
pars_(text.paragraphs()),
row_(row), pit_(pit), par_(text.paragraphs()[pit]),
pm_(text_metrics_.parMetrics(pit)),
- bidi_(bidi), erased_(pi_.erased_),
+ bidi_(bidi), change_(pi_.change_),
xo_(x), yo_(y), width_(text_metrics_.width())
{
bidi_.computeTables(par_, pi_.base.bv->buffer(), row_);
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
//row_.dump();
- BOOST_ASSERT(pit >= 0);
- BOOST_ASSERT(pit < int(text.paragraphs().size()));
+ LASSERT(pit >= 0, /**/);
+ LASSERT(pit < int(text.paragraphs().size()), /**/);
}
{
Font const font = text_metrics_.displayFont(pit_, pos);
- BOOST_ASSERT(inset);
+ LASSERT(inset, return);
// Backup full_repaint status because some insets (InsetTabular)
// requires a full repaint
bool pi_full_repaint = pi_.full_repaint;
pi_.base.bv->buffer().params().getFont().fontInfo() :
font.fontInfo();
pi_.ltr_pos = (bidi_.level(pos) % 2 == 0);
- pi_.erased_ = erased_ || par_.isDeleted(pos);
- pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
+ pi_.change_ = change_.changed() ? change_ : par_.lookupChange(pos);
+
+ int const x1 = int(x_);
+ pi_.base.bv->coordCache().insets().add(inset, x1, yo_);
// insets are painted completely. Recursive
- inset->drawSelection(pi_, int(x_), yo_);
- inset->draw(pi_, int(x_), yo_);
+ inset->drawBackground(pi_, x1, yo_);
+ inset->drawSelection(pi_, x1, yo_);
+ inset->draw(pi_, x1, yo_);
Dimension const & dim = pm_.insetDimension(inset);
pi_.full_repaint = pi_full_repaint;
#ifdef DEBUG_METRICS
- int const x1 = int(x_ - dim.width());
- Dimension dim2;
- BOOST_ASSERT(max_witdh_ > 0);
- int right_margin = text_metrics_.rightMargin(pm_);
- int const w = max_witdh_ - leftMargin() - right_margin;
- MetricsInfo mi(pi_.base.bv, font.fontInfo(), w);
- inset->metrics(mi, dim2);
- if (dim.wid != dim2.wid)
- lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
- << " draw width " << dim.width()
- << "> metrics width " << dim2.wid << "." << endl;
- if (dim->asc != dim2.asc)
- lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
- << " draw ascent " << dim.ascent()
- << "> metrics ascent " << dim2.asc << "." << endl;
- if (dim2.descent() != dim.des)
- lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
- << " draw ascent " << dim.descent()
- << "> metrics descent " << dim2.des << "." << endl;
- BOOST_ASSERT(dim2.wid == dim.wid);
- BOOST_ASSERT(dim2.asc == dim.asc);
- BOOST_ASSERT(dim2.des == dim.des);
int const x2 = x1 + dim.wid;
int const y1 = yo_ + dim.des;
int const y2 = yo_ - dim.asc;
for (pos_type i = pos - 1; i >= 0; --i) {
c = par_.getChar(i);
- if (!Encodings::isComposeChar_hebrew(c)) {
+ if (!Encodings::isHebrewComposeChar(c)) {
if (isPrintableNonspace(c)) {
int const width2 = pm_.singleWidth(i,
text_metrics_.displayFont(pit_, i));
for (pos_type i = pos - 1; i >= 0; --i) {
c = par_.getChar(i);
- if (!Encodings::isComposeChar_arabic(c)) {
+ if (!Encodings::isArabicComposeChar(c)) {
if (isPrintableNonspace(c)) {
int const width2 = pm_.singleWidth(i,
text_metrics_.displayFont(pit_, i));
{
// This method takes up 70% of time when typing
pos_type pos = bidi_.vis2log(vpos);
- pos_type const end = row_.endpos();
- FontSpan const font_span = par_.fontSpan(pos);
- Change::Type const prev_change = par_.lookupChange(pos).type;
-
// first character
vector<char_type> str;
str.reserve(100);
str[0] = par_.transformChar(c, pos);
}
+ pos_type const end = row_.endpos();
+ FontSpan const font_span = par_.fontSpan(pos);
+ // Track-change status.
+ Change const & change_running = par_.lookupChange(pos);
+
+ // selected text?
+ bool const selection = pos >= row_.sel_beg && pos < row_.sel_end;
+
+ char_type prev_char = ' ';
// collect as much similar chars as we can
for (++vpos ; vpos < end ; ++vpos) {
pos = bidi_.vis2log(vpos);
if (pos < font_span.first || pos > font_span.last)
break;
- if (prev_change != par_.lookupChange(pos).type)
+ bool const new_selection = pos >= row_.sel_beg && pos < row_.sel_end;
+ if (new_selection != selection)
+ // Selection ends or starts here.
+ break;
+
+ Change const & change = par_.lookupChange(pos);
+ if (!change_running.isSimilarTo(change))
+ // Track change type or author has changed.
break;
char_type c = par_.getChar(pos);
+ if (c == '\t' || prev_char == '\t') {
+ prev_char = c;
+ break;
+ }
+
if (!isPrintableNonspace(c))
break;
* of arabic and hebrew characters, then these breaks may have
* to be re-applied.
- if (arabic && Encodings::isComposeChar_arabic(c))
+ if (arabic && Encodings::isArabicComposeChar(c))
break;
- if (hebrew && Encodings::isComposeChar_hebrew(c))
+ if (hebrew && Encodings::isHebrewComposeChar(c))
break;
*/
docstring s(&str[0], str.size());
- if (prev_change != Change::UNCHANGED) {
- FontInfo copy = font;
- if (prev_change == Change::DELETED) {
- copy.setColor(Color_deletedtext);
- } else if (prev_change == Change::INSERTED) {
- copy.setColor(Color_addedtext);
- }
- x_ += pi_.pain.text(int(x_), yo_, s, copy);
- } else {
+ if (s[0] == '\t')
+ s.replace(0,1,from_ascii(" "));
+
+ if (!selection && !change_running.changed()) {
x_ += pi_.pain.text(int(x_), yo_, s, font);
+ return;
}
+
+ FontInfo copy = font;
+ if (change_running.changed())
+ copy.setPaintColor(change_running.color());
+ else if (selection)
+ copy.setPaintColor(Color_selectiontext);
+
+ x_ += pi_.pain.text(int(x_), yo_, s, copy);
}
// draw as many chars as we can
if ((!hebrew && !arabic)
- || (hebrew && !Encodings::isComposeChar_hebrew(c))
- || (arabic && !Encodings::isComposeChar_arabic(c))) {
+ || (hebrew && !Encodings::isHebrewComposeChar(c))
+ || (arabic && !Encodings::isArabicComposeChar(c))) {
paintChars(vpos, orig_font.fontInfo(), hebrew, arabic);
} else if (hebrew) {
paintHebrewComposeChar(vpos, orig_font.fontInfo());
y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
Buffer const & buffer = pi_.base.bv->buffer();
+ Layout const & layout = par_.layout();
- LayoutPtr const & layout = par_.layout();
-
- if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
+ if (buffer.params().paragraph_separation == BufferParams::ParagraphSkipSeparation) {
if (pit_ != 0) {
- if (layout->latextype == LATEX_PARAGRAPH
+ if (layout.latextype == LATEX_PARAGRAPH
&& !par_.getDepth()) {
y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
} else {
- LayoutPtr const & playout = pars_[pit_ - 1].layout();
- if (playout->latextype == LATEX_PARAGRAPH
+ 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);
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
// should we print a label?
- if (layout->labeltype >= LABEL_STATIC
- && (layout->labeltype != LABEL_STATIC
- || layout->latextype != LATEX_ENVIRONMENT
+ if (layout.labeltype >= LABEL_STATIC
+ && (layout.labeltype != LABEL_STATIC
+ || layout.latextype != LATEX_ENVIRONMENT
|| is_seq)) {
FontInfo const font = labelFont();
// this is special code for the chapter layout. This is
// printed in an extra row and has a pagebreak at
// the top.
- if (layout->counter == "chapter") {
+ if (layout.counter == "chapter") {
double spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
spacing_val = buffer.params().spacing().getValue();
}
- int const labeladdon = int(fm.maxHeight() * layout->spacing.getValue() * spacing_val);
+ int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val);
- int const maxdesc = int(fm.maxDescent() * layout->spacing.getValue() * spacing_val)
- + int(layout->parsep) * defaultRowHeight();
+ int const maxdesc = int(fm.maxDescent() * layout.spacing.getValue() * spacing_val)
+ + int(layout.parsep) * defaultRowHeight();
if (is_rtl) {
x = width_ - leftMargin() -
} else {
if (is_rtl) {
x = width_ - leftMargin()
- + fm.width(layout->labelsep);
+ + fm.width(layout.labelsep);
} else {
- x = x_ - fm.width(layout->labelsep)
+ x = x_ - fm.width(layout.labelsep)
- fm.width(str);
}
// the labels at the top of an environment.
// More or less for bibliography
} else if (is_seq &&
- (layout->labeltype == LABEL_TOP_ENVIRONMENT ||
- layout->labeltype == LABEL_BIBLIO ||
- layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
+ (layout.labeltype == LABEL_TOP_ENVIRONMENT ||
+ layout.labeltype == LABEL_BIBLIO ||
+ layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
FontInfo const font = labelFont();
docstring const str = par_.labelString();
if (!str.empty()) {
FontMetrics const & fm = theFontMetrics(font);
int const labeladdon = int(fm.maxHeight()
- * layout->spacing.getValue() * spacing_val);
+ * layout.spacing.getValue() * spacing_val);
int maxdesc =
- int(fm.maxDescent() * layout->spacing.getValue() * spacing_val
- + (layout->labelbottomsep * defaultRowHeight()));
+ int(fm.maxDescent() * layout.spacing.getValue() * spacing_val
+ + (layout.labelbottomsep * defaultRowHeight()));
double x = x_;
- if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
+ if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
if (is_rtl)
x = leftMargin();
x += (width_ - text_metrics_.rightMargin(pm_) - leftMargin()) / 2;
// paint imaginary end-of-paragraph character
- if (par_.isInserted(par_.size()) || par_.isDeleted(par_.size())) {
- FontMetrics const & fm = theFontMetrics(pi_.base.bv->buffer().params().getFont());
+ Change const & change = par_.lookupChange(par_.size());
+ if (change.changed()) {
+ FontMetrics const & fm =
+ theFontMetrics(pi_.base.bv->buffer().params().getFont());
int const length = fm.maxAscent() / 2;
- ColorCode col = par_.isInserted(par_.size()) ? Color_addedtext : Color_deletedtext;
+ 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);
- pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1, yo_ + 2, col,
- Painter::line_solid, Painter::line_thick);
+
+ 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);
+ } else {
+ pi_.pain.line(int(x_) + 1 - length, yo_ + 2, int(x_) + 1,
+ yo_ + 2, col, Painter::line_solid, Painter::line_thick);
+ }
+
}
// draw an endlabel
case END_LABEL_STATIC: {
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
- docstring const & str = par_.layout()->endlabelstring();
+ docstring const & str = par_.layout().endlabelstring();
double const x = is_rtl ?
x_ - fm.width(str)
: - text_metrics_.rightMargin(pm_) - 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);
if (!inset)
continue;
- if (x_ > pi_.base.bv->workWidth())
+ if (x_ > pi_.base.bv->workWidth()
+ || !cache.getInsets().has(inset))
continue;
- x_ = pi_.base.bv->coordCache().getInsets().x(inset);
+ 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;
paintInset(inset, pos);
+ pi_.selected = pi_selected;
}
}
body_pos = 0;
}
- LayoutPtr const & layout = par_.layout();
+ Layout const & layout = par_.layout();
- bool running_strikeout = false;
- bool is_struckout = false;
- int last_strikeout_x = 0;
+ Change change_running;
+ int change_last_x = 0;
// check for possible inline completion
DocIterator const & inlineCompletionPos = pi_.base.bv->inlineCompletionPos();
++vpos;
continue;
}
-
- is_struckout = par_.isDeleted(pos);
-
- if (is_struckout && !running_strikeout) {
- running_strikeout = true;
- last_strikeout_x = int(x_);
+ 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() == Inset::HIGHLY_EDITABLE;
- // If we reach the end of a struck out range, paint it.
+ // 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 (running_strikeout && (highly_editable_inset || !is_struckout)) {
+ 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 middle = yo_ - fm.maxAscent() / 3;
- pi_.pain.line(last_strikeout_x, middle, int(x_), middle,
- Color_deletedtext, Painter::line_solid, Painter::line_thin);
- running_strikeout = false;
+ 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 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(layout.labelsep);
x_ += row_.label_hfill + lwidth - width_pos;
}
} 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;
paintInset(inset, pos);
+ pi_.selected = pi_selected;
++vpos;
} else {
}
// if we reach the end of a struck out range, paint it
- if (running_strikeout) {
- // calculate 1/3 height of the buffer's default font
+ if (change_running.changed()) {
FontMetrics const & fm
= theFontMetrics(pi_.base.bv->buffer().params().getFont());
- int const middle = yo_ - fm.maxAscent() / 3;
- pi_.pain.line(last_strikeout_x, middle, int(x_), middle,
- Color_deletedtext, Painter::line_solid, Painter::line_thin);
- running_strikeout = false;
+ 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.setUnchanged();
}
}
// right to left?
if (rtl) {
swap(s1, s2);
- reverse(s1.begin(), s1.end());
- reverse(s2.begin(), s2.end());
swap(c1, c2);
}