#include "vspace.h"
#include "frontends/font_metrics.h"
+#include "frontends/nullpainter.h"
#include "frontends/Painter.h"
#include "insets/insettext.h"
#include "support/textutils.h"
using lyx::pos_type;
+using lyx::par_type;
using std::endl;
using std::max;
extern int NEST_MARGIN;
extern int CHANGEBAR_MARGIN;
+
namespace {
/**
class RowPainter {
public:
/// initialise and run painter
- RowPainter(BufferView const & bv, LyXText const & text,
- ParagraphList::iterator pit, RowList::iterator rit, int xo, int yo);
+ RowPainter(BufferView const & bv, Painter & pain, LyXText const & text,
+ par_type pit, RowList::iterator rit, int y);
private:
// paint various parts
void paintBackground();
/// LyXText for the row
LyXText const & text_;
+ ParagraphList & pars_;
/// The row to paint
RowList::iterator const rit_;
Row & row_;
/// Row's paragraph
- mutable ParagraphList::iterator pit_;
+ mutable par_type pit_;
// Looks ugly - is
double xo_;
};
-RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
- ParagraphList::iterator pit, RowList::iterator rit,
- int xo, int yo)
- : bv_(bv), pain_(bv_.painter()), text_(text), rit_(rit), row_(*rit),
- pit_(pit), xo_(xo), yo_(yo), x_(row_.x()),
- width_(text_.textWidth()),
- separator_(row_.fill_separator()),
- hfill_(row_.fill_hfill()),
- label_hfill_(row_.fill_label_hfill())
+RowPainter::RowPainter(BufferView const & bv, Painter & pain,
+ LyXText const & text, par_type pit, RowList::iterator rit, int y)
+ : bv_(bv), pain_(pain), text_(text), pars_(text.paragraphs()),
+ rit_(rit), row_(*rit), pit_(pit),
+ xo_(text_.xo_), yo_(y), width_(text_.width())
{
- x_ += xo_;
+ //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo << " yo: " << yo
+ // << " pit->y: " << pit_->y
+ // << " row: " << (pars_[pit_].size() ? pars_[pit_].getChar(row_.pos()) : 'X') << endl;
+ RowMetrics m = text_.computeRowMetrics(pit, row_);
+ x_ = m.x + xo_;
+ separator_ = m.separator;
+ hfill_ = m.hfill;
+ label_hfill_ = m.label_hfill;
// background has already been cleared.
if (&text_ == bv_.text())
paintBackground();
// paint the selection background
- if (bv_.selection().set() && &text_ == bv_.fullCursor().innerText())
+ if (bv_.cursor().selection() && &text_ == bv_.cursor().text())
paintSelection();
// vertical lines for appendix
if (row_.pos() == 0)
paintFirst();
- if (row_.endpos() >= pit_->size())
+ if (row_.endpos() >= pars_[pit_].size())
paintLast();
// paint text
void RowPainter::paintInset(pos_type const pos)
{
- InsetOld * inset = const_cast<InsetOld*>(pit_->getInset(pos));
-
+ InsetBase const * inset = pars_[pit_].getInset(pos);
BOOST_ASSERT(inset);
-
- PainterInfo pi(const_cast<BufferView *>(&bv_));
+ PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
pi.base.font = getFont(pos);
+ inset->drawSelection(pi, int(x_), yo_ + row_.baseline());
inset->draw(pi, int(x_), yo_ + row_.baseline());
x_ += inset->width();
}
string str;
// first char
- char c = pit_->getChar(pos);
+ char c = pars_[pit_].getChar(pos);
str += c;
++vpos;
int dx = 0;
for (pos_type i = pos - 1; i >= 0; --i) {
- c = pit_->getChar(i);
+ c = pars_[pit_].getChar(i);
if (!Encodings::IsComposeChar_hebrew(c)) {
if (IsPrintableNonspace(c)) {
int const width2 = singleWidth(i, c);
string str;
// first char
- char c = pit_->getChar(pos);
- c = pit_->transformChar(c, pos);
- str +=c;
+ char c = pars_[pit_].getChar(pos);
+ c = pars_[pit_].transformChar(c, pos);
+ str += c;
++vpos;
LyXFont const & font = getFont(pos);
int dx = 0;
for (pos_type i = pos - 1; i >= 0; --i) {
- c = pit_->getChar(i);
+ c = pars_[pit_].getChar(i);
if (!Encodings::IsComposeChar_arabic(c)) {
if (IsPrintableNonspace(c)) {
int const width2 = singleWidth(i, c);
// first character
string str;
- str += pit_->getChar(pos);
+ str += pars_[pit_].getChar(pos);
if (arabic) {
unsigned char c = str[0];
- str[0] = pit_->transformChar(c, pos);
+ str[0] = pars_[pit_].transformChar(c, pos);
}
- bool prev_struckout = isDeletedText(*pit_, pos);
- bool prev_newtext = isInsertedText(*pit_, pos);
+ bool prev_struckout = isDeletedText(pars_[pit_], pos);
+ bool prev_newtext = isInsertedText(pars_[pit_], pos);
// collect as much similar chars as we can
for (++vpos; vpos < end && (pos = text_.bidi.vis2log(vpos)) >= 0; ++vpos) {
- char c = pit_->getChar(pos);
+ char c = pars_[pit_].getChar(pos);
if (!IsPrintableNonspace(c))
break;
- if (prev_struckout != isDeletedText(*pit_, pos))
+ if (prev_struckout != isDeletedText(pars_[pit_], pos))
break;
- if (prev_newtext != isInsertedText(*pit_, pos))
+ if (prev_newtext != isInsertedText(pars_[pit_], pos))
break;
if (arabic && Encodings::IsComposeChar_arabic(c))
break;
if (arabic)
- c = pit_->transformChar(c, pos);
+ c = pars_[pit_].transformChar(c, pos);
str += c;
}
double const orig_x = x_;
- char const c = pit_->getChar(pos);
+ char const c = pars_[pit_].getChar(pos);
if (c == Paragraph::META_INSET) {
paintInset(pos);
void RowPainter::paintSelection()
{
- bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
+ bool const is_rtl = text_.isRTL(pars_[pit_]);
// the current selection
- int const startx = text_.cursorX(text_.selStart());
- int const endx = text_.cursorX(text_.selEnd());
- int const starty = text_.cursorY(text_.selStart());
- int const endy = text_.cursorY(text_.selEnd());
- ParagraphList::iterator startpit = text_.getPar(text_.selStart());
- ParagraphList::iterator endpit = text_.getPar(text_.selEnd());
- RowList::iterator startrow = startpit->getRow(text_.selStart().pos());
- RowList::iterator endrow = endpit->getRow(text_.selEnd().pos());
+ LCursor const & cur = bv_.cursor();
+ int const starty = text_.cursorY(cur.selBegin());
+ int const endy = text_.cursorY(cur.selEnd());
+ par_type startpit = cur.selBegin().par();
+ par_type endpit = cur.selEnd().par();
+ RowList::iterator startrow = pars_[startpit].getRow(cur.selBegin().pos());
+ RowList::iterator endrow = pars_[endpit].getRow(cur.selEnd().pos());
int const h = row_.height();
- int const row_y = pit_->y + row_.y_offset();
+ int const row_y = text_.yo_ + pars_[pit_].y + row_.y_offset();
bool const sel_starts_here = startpit == pit_ && startrow == rit_;
bool const sel_ends_here = endpit == pit_ && endrow == rit_;
bool const sel_on_one_row = sel_starts_here && sel_ends_here;
if (text_.bidi.same_direction()) {
- int x;
- int w;
if (sel_on_one_row) {
- if (startx < endx) {
- x = int(xo_) + startx;
- w = endx - startx;
- } else {
- x = int(xo_) + endx;
- w = startx - endx;
- }
- pain_.fillRectangle(x, yo_, w, h, LColor::selection);
+ int const startx = text_.cursorX(cur.selBegin());
+ int const endx = text_.cursorX(cur.selEnd());
+ int const x1 = is_rtl ? endx : startx;
+ int const x2 = is_rtl ? startx : endx;
+ pain_.fillRectangle(x1, yo_, x2 - x1, h, LColor::selection);
} else if (sel_starts_here) {
- int const x = is_rtl ? int(xo_) : int(xo_ + startx);
- int const w = is_rtl ? startx : (width_ - startx);
- pain_.fillRectangle(x, yo_, w, h, LColor::selection);
+ int const startx = text_.cursorX(cur.selBegin());
+ int const x1 = is_rtl ? int(xo_) : startx;
+ int const x2 = is_rtl ? startx : int(xo_) + width_;
+ pain_.fillRectangle(x1, yo_, x2 - x1, h, LColor::selection);
} else if (sel_ends_here) {
- int const x = is_rtl ? int(xo_ + endx) : int(xo_);
- int const w = is_rtl ? (width_ - endx) : endx;
- pain_.fillRectangle(x, yo_, w, h, LColor::selection);
+ int const endx = text_.cursorX(cur.selEnd());
+ int const x1 = is_rtl ? endx : int(xo_);
+ int const x2 = is_rtl ? int(xo_) + width_ : endx;
+ pain_.fillRectangle(x1, yo_, x2 - x1, h, LColor::selection);
} else if (row_y > starty && row_y < endy) {
pain_.fillRectangle(int(xo_), yo_, width_, h, LColor::selection);
}
pain_.fillRectangle(int(xo_), yo_,
int(x_), h, LColor::selection);
- pos_type const body_pos = pit_->beginOfBody();
+ pos_type const body_pos = pars_[pit_].beginOfBody();
pos_type const end = row_.endpos();
double tmpx = x_;
pos_type pos = text_.bidi.vis2log(vpos);
double const old_tmpx = tmpx;
if (body_pos > 0 && pos == body_pos - 1) {
- LyXLayout_ptr const & layout = pit_->layout();
+ LyXLayout_ptr const & layout = pars_[pit_].layout();
LyXFont const lfont = getLabelFont();
tmpx += label_hfill_ + font_metrics::width(layout->labelsep, lfont);
- if (pit_->isLineSeparator(body_pos - 1))
+ if (pars_[pit_].isLineSeparator(body_pos - 1))
tmpx -= singleWidth(body_pos - 1);
}
tmpx += singleWidth(pos);
- if (hfillExpansion(*pit_, row_, pos)) {
+ if (hfillExpansion(pars_[pit_], row_, pos)) {
if (pos >= body_pos)
tmpx += hfill_;
else
tmpx += label_hfill_;
} else {
- if (pit_->isSeparator(pos) && pos >= body_pos)
+ if (pars_[pit_].isSeparator(pos) && pos >= body_pos)
tmpx += separator_;
}
if (((startpit != pit_ && startrow != rit_)
- || text_.selStart().pos() <= pos) &&
+ || cur.selBegin().pos() <= pos) &&
((endpit != pit_ && endrow != rit_)
- || pos < text_.selEnd().pos())) {
+ || pos < cur.selEnd().pos())) {
// Here we do not use x_ as xo_ was added to x_.
pain_.fillRectangle(int(old_tmpx), yo_,
int(tmpx - old_tmpx + 1), h, LColor::selection);
pos_type const start = row_.pos();
pos_type const end = row_.endpos();
- if (start == end || !pit_->isChanged(start, end - 1))
+ if (start == end || !pars_[pit_].isChanged(start, end - 1))
return;
int const height = text_.isLastRow(pit_, row_)
void RowPainter::paintAppendix()
{
- if (!pit_->params().appendix())
+ if (!pars_[pit_].params().appendix())
return;
- // FIXME: can be just width_ ?
- int const ww = width_;
-
int y = yo_;
- if (pit_->params().startOfAppendix())
+ if (pars_[pit_].params().startOfAppendix())
y += 2 * defaultRowHeight();
pain_.line(1, y, 1, yo_ + row_.height(), LColor::appendix);
- pain_.line(ww - 2, y, ww - 2, yo_ + row_.height(), LColor::appendix);
+ pain_.line(width_ - 2, y, width_ - 2, yo_ + row_.height(), LColor::appendix);
}
void RowPainter::paintDepthBar()
{
- Paragraph::depth_type const depth = pit_->getDepth();
+ Paragraph::depth_type const depth = pars_[pit_].getDepth();
if (depth <= 0)
return;
Paragraph::depth_type prev_depth = 0;
if (!text_.isFirstRow(pit_, row_)) {
- ParagraphList::iterator pit2 = pit_;
+ par_type pit2 = pit_;
if (row_.pos() == 0)
--pit2;
- prev_depth = pit2->getDepth();
+ prev_depth = pars_[pit2].getDepth();
}
Paragraph::depth_type next_depth = 0;
if (!text_.isLastRow(pit_, row_)) {
- ParagraphList::iterator pit2 = pit_;
- if (row_.endpos() >= pit2->size())
+ par_type pit2 = pit_;
+ if (row_.endpos() >= pars_[pit2].size())
++pit2;
- next_depth = pit2->getDepth();
+ next_depth = pars_[pit2].getDepth();
}
for (Paragraph::depth_type i = 1; i <= depth; ++i) {
void RowPainter::paintFirst()
{
- ParagraphParameters const & parparams = pit_->params();
+ ParagraphParameters const & parparams = pars_[pit_].params();
int y_top = 0;
Buffer const & buffer = *bv_.buffer();
- LyXLayout_ptr const & layout = pit_->layout();
+ LyXLayout_ptr const & layout = pars_[pit_].layout();
if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
- if (pit_ != text_.paragraphs().begin()) {
+ if (pit_ != 0) {
if (layout->latextype == LATEX_PARAGRAPH
- && !pit_->getDepth()) {
+ && !pars_[pit_].getDepth()) {
y_top += buffer.params().getDefSkip().inPixels(bv_);
} else {
- LyXLayout_ptr const & playout =
- boost::prior(pit_)->layout();
+ LyXLayout_ptr const & playout = pars_[pit_ - 1].layout();
if (playout->latextype == LATEX_PARAGRAPH
- && !boost::prior(pit_)->getDepth()) {
+ && !pars_[pit_ - 1].getDepth()) {
// is it right to use defskip here, too? (AS)
y_top += buffer.params().getDefSkip().inPixels(bv_);
}
}
}
- int const ww = bv_.workWidth();
-
- bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
+ bool const is_rtl = text_.isRTL(pars_[pit_]);
bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
- //lyxerr << "paintFirst: " << pit_->id() << " is_seq: " << is_seq << std::endl;
+ //lyxerr << "paintFirst: " << pars_[pit_].id() << " is_seq: " << is_seq << std::endl;
// should we print a label?
if (layout->labeltype >= LABEL_STATIC
|| is_seq)) {
LyXFont font = getLabelFont();
- if (!pit_->getLabelstring().empty()) {
+ if (!pars_[pit_].getLabelstring().empty()) {
double x = x_;
- string const str = pit_->getLabelstring();
+ string const str = pars_[pit_].getLabelstring();
// this is special code for the chapter layout. This is
// printed in an extra row and has a pagebreak at
+ int(layout->parsep) * defaultRowHeight();
if (is_rtl) {
- x = ww - leftMargin() -
+ x = width_ - leftMargin() -
font_metrics::width(str, font);
}
}
} else {
if (is_rtl) {
- x = ww - leftMargin()
+ x = width_ - leftMargin()
+ font_metrics::width(layout->labelsep, font);
} else {
x = x_ - font_metrics::width(layout->labelsep, font)
layout->labeltype == LABEL_BIBLIO ||
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
LyXFont font = getLabelFont();
- if (!pit_->getLabelstring().empty()) {
- string const str = pit_->getLabelstring();
+ if (!pars_[pit_].getLabelstring().empty()) {
+ string const str = pars_[pit_].getLabelstring();
float spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
double x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
x = ((is_rtl ? leftMargin() : x_)
- + ww - text_.rightMargin(*pit_)) / 2;
+ + width_ - text_.rightMargin(pars_[pit_])) / 2;
x -= font_metrics::width(str, font) / 2;
} else if (is_rtl) {
- x = ww - leftMargin() -
+ x = width_ - leftMargin() -
font_metrics::width(str, font);
}
pain_.text(int(x),
void RowPainter::paintLast()
{
- int const ww = bv_.workWidth();
- bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
+ bool const is_rtl = text_.isRTL(pars_[pit_]);
int const endlabel = getEndLabel(pit_, text_.paragraphs());
// draw an endlabel
LyXFont const font = getLabelFont();
int const size = int(0.75 * font_metrics::maxAscent(font));
int const y = yo_ + row_.baseline() - size;
- int x = is_rtl ? NEST_MARGIN + CHANGEBAR_MARGIN: ww - size;
+ int x = is_rtl ? NEST_MARGIN + CHANGEBAR_MARGIN: width_ - size;
- if (row_.fill() <= size)
- x += (size - row_.fill() + 1) * (is_rtl ? -1 : 1);
+ if (width_ - int(row_.width()) <= size)
+ x += (size - width_ + row_.width() + 1) * (is_rtl ? -1 : 1);
if (endlabel == END_LABEL_BOX)
pain_.rectangle(x, y, size, size, LColor::eolmarker);
case END_LABEL_STATIC: {
LyXFont font = getLabelFont();
- string const & str = pit_->layout()->endlabelstring();
+ string const & str = pars_[pit_].layout()->endlabelstring();
double const x = is_rtl ?
x_ - font_metrics::width(str, font)
- : ww - text_.rightMargin(*pit_) - row_.fill();
+ : - text_.rightMargin(pars_[pit_]) - row_.width();
pain_.text(int(x), yo_ + row_.baseline(), str, font);
break;
}
void RowPainter::paintText()
{
pos_type const end = row_.endpos();
- pos_type body_pos = pit_->beginOfBody();
+ pos_type body_pos = pars_[pit_].beginOfBody();
if (body_pos > 0 &&
- (body_pos > end || !pit_->isLineSeparator(body_pos - 1))) {
+ (body_pos > end || !pars_[pit_].isLineSeparator(body_pos - 1))) {
body_pos = 0;
}
- LyXLayout_ptr const & layout = pit_->layout();
+ LyXLayout_ptr const & layout = pars_[pit_].layout();
bool running_strikeout = false;
bool is_struckout = false;
pos_type pos = text_.bidi.vis2log(vpos);
- if (pos >= pit_->size()) {
+ if (pos >= pars_[pit_].size()) {
++vpos;
continue;
}
continue;
}
- is_struckout = isDeletedText(*pit_, pos);
+ is_struckout = isDeletedText(pars_[pit_], pos);
if (is_struckout && !running_strikeout) {
running_strikeout = true;
last_strikeout_x = int(x_);
}
- bool const highly_editable_inset = pit_->isInset(pos)
- && isHighlyEditableInset(pit_->getInset(pos));
+ bool const highly_editable_inset = pars_[pit_].isInset(pos)
+ && isHighlyEditableInset(pars_[pit_].getInset(pos));
// if we reach the end of a struck out range, paint it
// we also don't paint across things like tables
x_ += label_hfill_ + lwidth - singleWidth(body_pos - 1);
}
- if (pit_->isHfill(pos)) {
+ if (pars_[pit_].isHfill(pos)) {
x_ += 1;
int const y0 = yo_ + row_.baseline();
pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
- if (hfillExpansion(*pit_, row_, pos)) {
+ if (hfillExpansion(pars_[pit_], row_, pos)) {
int const y2 = (y0 + y1) / 2;
if (pos >= body_pos) {
}
x_ += 2;
++vpos;
- } else if (pit_->isSeparator(pos)) {
+ } else if (pars_[pit_].isSeparator(pos)) {
x_ += singleWidth(pos);
if (pos >= body_pos)
x_ += separator_;
}
-int paintPars(BufferView const & bv, LyXText const & text,
- ParagraphList::iterator pit, int xo, int yo, int y)
+int paintPars(BufferView const & bv, Painter & pain,
+ LyXText const & text, par_type pit, par_type end)
{
//lyxerr << " paintRows: pit: " << &*pit << endl;
- int const y2 = bv.painter().paperHeight();
- y -= bv.top_y();
+ ParagraphList & pars = text.paragraphs();
- ParagraphList::iterator end = text.paragraphs().end();
+ int y = pars[pit].y + text.yo_ - bv.top_y();
+ int const y2 = pain.paperHeight();
- for ( ; pit != end; ++pit) {
- RowList::iterator row = pit->rows.begin();
- RowList::iterator rend = pit->rows.end();
+ for (; pit != end; ++pit) {
+ RowList::iterator row = pars[pit].rows.begin();
+ RowList::iterator rend = pars[pit].rows.end();
for ( ; row != rend; ++row) {
- RowPainter(bv, text, pit, row, xo, y + yo);
+ RowPainter(bv, pain, text, pit, row, y);
y += row->height();
+ if (y >= y2)
+ break;
}
- if (yo + y >= y2)
- break;
- }
+ }
return y;
}
+
} // namespace anon
+void refreshPar(BufferView const & bv, LyXText const & text, par_type pit)
+{
+
+ static NullPainter nop;
+ paintPars(bv, nop, text, pit, pit + 1);
+}
+
+
int paintText(BufferView const & bv)
{
- ParagraphList::iterator pit;
- bv.text()->getRowNearY(bv.top_y(), pit);
- return paintPars(bv, *bv.text(), pit, 0, 0, pit->y);
+ par_type pit, end;
+ getParsInRange(bv.text()->paragraphs(), bv.top_y(),
+ bv.top_y() + bv.workHeight(), pit, end);
+ //lyxerr << "top_y: " << bv.top_y() << " y: " << pit->y << endl;
+ return paintPars(bv, bv.painter(), *bv.text(), pit, end);
}
-void paintTextInset(LyXText const & text, PainterInfo & pi, int xo, int yo)
+void paintTextInset(LyXText const & text, PainterInfo & pi)
{
- paintPars(*pi.base.bv, text, text.paragraphs().begin(), xo, yo, 0);
+ paintPars(*pi.base.bv, pi.pain, text, 0, text.paragraphs().size());
}
projects / lyx.git / blobdiff