#include "support/debug.h"
#include "support/textutils.h"
-#include <boost/assert.hpp>
+#include "support/lassert.h"
#include <boost/crc.hpp>
-#include <ostream>
-
using namespace std;
namespace lyx {
//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;
#ifdef DEBUG_METRICS
int const x1 = int(x_ - dim.width());
Dimension dim2;
- BOOST_ASSERT(max_witdh_ > 0);
+ LASSERT(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);
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);
+ LASSERT(dim2.wid == dim.wid, /**/);
+ LASSERT(dim2.asc == dim.asc, /**/);
+ LASSERT(dim2.des == dim.des, /**/);
int const x2 = x1 + dim.wid;
int const y1 = yo_ + dim.des;
int const y2 = yo_ - dim.asc;
{
// 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?
- pit_type const p0 = pi_.base.bv->cursor().selBegin().pit();
- bool selection = row_.sel_beg > -1 && row_.sel_beg != row_.sel_end
- && ((pit_ == p0 && (pos >= row_.sel_beg && pos < row_.sel_end))
- || (pit_ > p0 && pos < row_.sel_end));
+ bool const selection = pos >= row_.sel_beg && pos < row_.sel_end;
// collect as much similar chars as we can
for (++vpos ; vpos < end ; ++vpos) {
if (pos < font_span.first || pos > font_span.last)
break;
- if (row_.sel_beg > -1 && row_.sel_beg != row_.sel_end &&
- ((pit_ == p0 && pos == row_.sel_beg) || pos == row_.sel_end))
+ bool const new_selection = pos >= row_.sel_beg && pos < row_.sel_end;
+ if (new_selection != selection)
+ // Selection ends or starts here.
break;
- if (prev_change != par_.lookupChange(pos).type)
+ 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);
docstring s(&str[0], str.size());
- if (selection || prev_change != Change::UNCHANGED) {
- FontInfo copy = font;
- if (selection) {
- copy.setColor(Color_selectiontext);
- } else 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 (!selection && !change_running.changed()) {
x_ += pi_.pain.text(int(x_), yo_, s, font);
+ return;
}
+
+ FontInfo copy = font;
+ if (change_running.changed())
+ copy.setColor(change_running.color());
+ else if (selection)
+ copy.setColor(Color_selectiontext);
+
+ x_ += pi_.pain.text(int(x_), yo_, s, copy);
}
// 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;
+ ColorCode 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
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) {
}
// 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);
}