*/
#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 {
//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()), /**/);
}
-FontInfo const RowPainter::getLabelFont() const
+FontInfo RowPainter::labelFont() const
{
- return text_.getLabelFont(pi_.base.bv->buffer(), par_);
+ return text_.labelFont(pi_.base.bv->buffer(), par_);
}
void RowPainter::paintInset(Inset const * inset, pos_type const pos)
{
- Font const font = text_metrics_.getDisplayFont(pit_, pos);
+ 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;
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_.getDisplayFont(pit_, i));
+ text_metrics_.displayFont(pit_, i));
dx = (c == 0x05e8 || // resh
c == 0x05d3) // dalet
? width2 - width
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_.getDisplayFont(pit_, i));
+ text_metrics_.displayFont(pit_, i));
dx = (width2 - width) / 2;
}
break;
{
// 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.setColor(change_running.color());
+ else if (selection)
+ copy.setColor(Color_selectiontext);
+
+ x_ += pi_.pain.text(int(x_), yo_, s, copy);
}
void RowPainter::paintFromPos(pos_type & vpos)
{
pos_type const pos = bidi_.vis2log(vpos);
- Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
+ Font const orig_font = text_metrics_.displayFont(pit_, pos);
double const orig_x = x_;
// usual characters, no insets
// 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 = getLabelFont();
+ FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
- docstring const str = par_.getLabelstring();
+ docstring const str = par_.labelString();
if (!str.empty()) {
double x = x_;
// 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)) {
- FontInfo const font = getLabelFont();
- if (!par_.getLabelstring().empty()) {
- docstring const str = par_.getLabelstring();
+ (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()) {
double spacing_val = 1.0;
if (!parparams.spacing().isDefault())
spacing_val = parparams.spacing().getValue();
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;
+ 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
switch (endlabel) {
case END_LABEL_BOX:
case END_LABEL_FILLED_BOX: {
- FontInfo const font = getLabelFont();
+ FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
}
case END_LABEL_STATIC: {
- FontInfo const font = getLabelFont();
+ 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();
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();
if (inlineCompletionPos.inTexted()
&& inlineCompletionPos.text() == &text_
&& inlineCompletionPos.pit() == pit_
- && inlineCompletionPos.pos() >= row_.pos()
- && inlineCompletionPos.pos() < row_.endpos()) {
- // draw visually behind the previous character
+ && 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 above
if (vpos < font_span.first || vpos > font_span.last) {
font_span = par_.fontSpan(vpos);
- font = text_metrics_.getDisplayFont(pit_, vpos);
+ font = text_metrics_.displayFont(pit_, vpos);
// split font span if inline completion is inside
if (font_span.first <= inlineCompletionVPos
++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(getLabelFont())
- .width(layout->labelsep);
+ int const lwidth = theFontMetrics(labelFont())
+ .width(layout.labelsep);
x_ += row_.label_hfill + lwidth - width_pos;
}
// Is the inline completion in front of character?
if (font.isRightToLeft() && vpos == inlineCompletionVPos)
- paintInlineCompletion(font);
+ paintInlineCompletion(font);
if (par_.isSeparator(pos)) {
- Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
+ Font const orig_font = text_metrics_.displayFont(pit_, pos);
double const orig_x = x_;
x_ += width_pos;
if (pos >= body_pos)
}
// 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();
}
}
{
docstring completion = pi_.base.bv->inlineCompletion();
FontInfo f = font.fontInfo();
-
- // right to left?
- if (font.isRightToLeft())
- reverse(completion.begin(), completion.end());
+ bool rtl = font.isRightToLeft();
// draw the unique and the non-unique completion part
// Note: this is not time-critical as it is
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.size() > 0) {
- f.setColor(Color_inlinecompletion);
- pi_.pain.text(x_, yo_, s1, f);
+ f.setColor(c1);
+ pi_.pain.text(int(x_), yo_, s1, f);
x_ += theFontMetrics(font).width(s1);
}
if (s2.size() > 0) {
- f.setColor(Color_nonunique_inlinecompletion);
- pi_.pain.text(x_, yo_, s2, f);
+ f.setColor(c2);
+ pi_.pain.text(int(x_), yo_, s2, f);
x_ += theFontMetrics(font).width(s2);
}
}
projects / lyx.git / blobdiff