#include "rowpainter.h"
#include "buffer.h"
+#include "coordcache.h"
#include "cursor.h"
#include "debug.h"
#include "bufferparams.h"
#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::pit_type;
using std::endl;
using std::max;
+using std::min;
using std::string;
-extern int PAPER_MARGIN;
-extern int CHANGEBAR_MARGIN;
-extern int LEFT_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);
-private:
+ RowPainter(PainterInfo & pi, LyXText const & text,
+ pit_type pit, Row & row, int x, int y);
+
// paint various parts
- void paintBackground();
- void paintSelection();
void paintAppendix();
void paintDepthBar();
void paintChangeBar();
void paintFirst();
void paintLast();
+ void paintText();
+
+private:
void paintForeignMark(double orig_x, LyXFont const & orig_font);
void paintHebrewComposeChar(lyx::pos_type & vpos);
void paintArabicComposeChar(lyx::pos_type & vpos);
void paintChars(lyx::pos_type & vpos, bool hebrew, bool arabic);
int paintAppendixStart(int y);
- int paintLengthMarker(string const & prefix, VSpace const & vsp, int start);
- void paintText();
void paintFromPos(lyx::pos_type & vpos);
void paintInset(lyx::pos_type const pos);
/// 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_;
+ pit_type const pit_;
+ Paragraph const & par_;
// Looks ugly - is
- double xo_;
- int yo_;
+ double const xo_;
+ int const yo_; // current baseline
double x_;
int width_;
double separator_;
};
-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_.workWidth()),
- separator_(row_.fill_separator()),
- hfill_(row_.fill_hfill()),
- label_hfill_(row_.fill_label_hfill())
+RowPainter::RowPainter(PainterInfo & pi,
+ LyXText const & text, pit_type pit, Row & row, int x, int y)
+ : bv_(*pi.base.bv), pain_(pi.pain), text_(text), pars_(text.paragraphs()),
+ row_(row), pit_(pit), par_(text.paragraphs()[pit]),
+ xo_(x), yo_(y), width_(text_.width())
{
- x_ += xo_;
+ RowMetrics m = text_.computeRowMetrics(pit, row_);
+ x_ = m.x + xo_;
- // background has already been cleared.
- if (&text_ == bv_.text)
- paintBackground();
+ //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
+ //row_.dump();
- // paint the selection background
- if (text_.selection.set() && &text_ == bv_.cursor().innerText())
- paintSelection();
+ separator_ = m.separator;
+ hfill_ = m.hfill;
+ label_hfill_ = m.label_hfill;
- // vertical lines for appendix
- paintAppendix();
-
- // environment depth brackets
- paintDepthBar();
-
- // changebar
- paintChangeBar();
-
- if (row_.pos() == 0)
- paintFirst();
-
- if (row_.endpos() >= pit_->size())
- paintLast();
-
- // paint text
- paintText();
+ BOOST_ASSERT(pit >= 0);
+ BOOST_ASSERT(pit < int(text.paragraphs().size()));
}
/// "temporary"
LyXFont const RowPainter::getFont(pos_type pos) const
{
- return text_.getFont(pit_, pos);
+ return text_.getFont(par_, pos);
}
int RowPainter::singleWidth(lyx::pos_type pos) const
{
- return text_.singleWidth(pit_, pos);
+ return text_.singleWidth(par_, pos);
}
int RowPainter::singleWidth(lyx::pos_type pos, char c) const
{
- LyXFont const & font = text_.getFont(pit_, pos);
- return text_.singleWidth(pit_, pos, c, font);
+ LyXFont const & font = text_.getFont(par_, pos);
+ return text_.singleWidth(par_, pos, c, font);
}
LyXFont const RowPainter::getLabelFont() const
{
- return text_.getLabelFont(pit_);
+ return text_.getLabelFont(par_);
}
int RowPainter::leftMargin() const
{
- return text_.leftMargin(pit_, row_);
+ return text_.leftMargin(pit_, row_.pos());
}
void RowPainter::paintInset(pos_type const pos)
{
- InsetOld * inset = const_cast<InsetOld*>(pit_->getInset(pos));
-
+ InsetBase const * inset = par_.getInset(pos);
BOOST_ASSERT(inset);
-
- PainterInfo pi(const_cast<BufferView *>(&bv_));
+ PainterInfo pi(const_cast<BufferView *>(&bv_), pain_);
pi.base.font = getFont(pos);
- inset->draw(pi, int(x_), yo_ + row_.baseline());
+ pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0);
+ theCoords.insets_.add(inset, int(x_), yo_);
+ inset->drawSelection(pi, int(x_), yo_);
+ inset->draw(pi, int(x_), yo_);
x_ += inset->width();
}
string str;
// first char
- char c = pit_->getChar(pos);
+ char c = par_.getChar(pos);
str += c;
++vpos;
int dx = 0;
for (pos_type i = pos - 1; i >= 0; --i) {
- c = pit_->getChar(i);
+ c = par_.getChar(i);
if (!Encodings::IsComposeChar_hebrew(c)) {
if (IsPrintableNonspace(c)) {
int const width2 = singleWidth(i, c);
}
// Draw nikud
- pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
+ pain_.text(int(x_) + dx, yo_, str, font);
}
string str;
// first char
- char c = pit_->getChar(pos);
- c = pit_->transformChar(c, pos);
- str +=c;
+ char c = par_.getChar(pos);
+ c = par_.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 = par_.getChar(i);
if (!Encodings::IsComposeChar_arabic(c)) {
if (IsPrintableNonspace(c)) {
int const width2 = singleWidth(i, c);
}
}
// Draw nikud
- pain_.text(int(x_) + dx, yo_ + row_.baseline(), str, font);
+ pain_.text(int(x_) + dx, yo_, str, font);
}
// first character
string str;
- str += pit_->getChar(pos);
+ str += par_.getChar(pos);
if (arabic) {
unsigned char c = str[0];
- str[0] = pit_->transformChar(c, pos);
+ str[0] = par_.transformChar(c, pos);
}
- bool prev_struckout = isDeletedText(*pit_, pos);
- bool prev_newtext = isInsertedText(*pit_, pos);
+ bool prev_struckout = isDeletedText(par_, pos);
+ bool prev_newtext = isInsertedText(par_, 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 = par_.getChar(pos);
if (!IsPrintableNonspace(c))
break;
- if (prev_struckout != isDeletedText(*pit_, pos))
+ if (prev_struckout != isDeletedText(par_, pos))
break;
- if (prev_newtext != isInsertedText(*pit_, pos))
+ if (prev_newtext != isInsertedText(par_, pos))
break;
if (arabic && Encodings::IsComposeChar_arabic(c))
break;
if (arabic)
- c = pit_->transformChar(c, pos);
+ c = par_.transformChar(c, pos);
str += c;
}
orig_font.setColor(LColor::newtext);
// Draw text and set the new x position
- //lyxerr << "paint row: yo_ " << yo_ << " baseline: " << row_.baseline()
- // << "\n";
- pain_.text(int(x_), yo_ + row_.baseline(), str, orig_font);
+ //lyxerr << "paint row: yo_ " << yo_ << "\n";
+ pain_.text(int(x_), yo_, str, orig_font);
x_ += font_metrics::width(str, orig_font);
}
if (orig_font.language() == bv_.buffer()->params().language)
return;
- int const y = yo_ + row_.baseline() + 1;
+ int const y = yo_ + 1;
pain_.line(int(orig_x), y, int(x_), y, LColor::language);
}
double const orig_x = x_;
- char const c = pit_->getChar(pos);
+ char const c = par_.getChar(pos);
if (c == Paragraph::META_INSET) {
paintInset(pos);
}
-void RowPainter::paintBackground()
-{
- int const x = int(xo_);
- int const y = yo_ < 0 ? 0 : yo_;
- int const h = yo_ < 0 ? row_.height() + yo_ : row_.height();
- pain_.fillRectangle(x, y, width_, h, text_.backgroundColor());
-}
-
-
-void RowPainter::paintSelection()
-{
- bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
-
- // the current selection
- int const startx = text_.selection.start.x();
- int const endx = text_.selection.end.x();
- int const starty = text_.selection.start.y();
- int const endy = text_.selection.end.y();
- ParagraphList::iterator startpit = text_.getPar(text_.selection.start);
- ParagraphList::iterator endpit = text_.getPar(text_.selection.end);
- RowList::iterator startrow = startpit->getRow(text_.selection.start.pos());
- RowList::iterator endrow = endpit->getRow(text_.selection.end.pos());
- int const h = row_.height();
-
- int const row_y = pit_->y + row_.y_offset();
-
- if (text_.bidi.same_direction()) {
- int x;
- int w;
- if ((startpit == pit_ && startrow == rit_) &&
- (endpit == pit_ && endrow == rit_)) {
- 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);
- } else if (startpit == pit_ && startrow == rit_) {
- 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);
- } else if (endpit == pit_ && endrow == rit_) {
- 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);
- } else if (row_y > starty && row_y < endy) {
- pain_.fillRectangle(int(xo_), yo_, width_, h, LColor::selection);
- }
- return;
- }
-
- if ((startpit != pit_ && startrow != rit_ && !is_rtl)
- || (endpit != pit_ && endrow != rit_ && is_rtl))
- pain_.fillRectangle(int(xo_), yo_,
- int(x_), h, LColor::selection);
-
- pos_type const body_pos = pit_->beginOfBody();
- pos_type const end = row_.endpos();
- double tmpx = x_;
-
- for (pos_type vpos = row_.pos(); vpos < end; ++vpos) {
- 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();
- LyXFont const lfont = getLabelFont();
-
- tmpx += label_hfill_ + font_metrics::width(layout->labelsep, lfont);
-
- if (pit_->isLineSeparator(body_pos - 1))
- tmpx -= singleWidth(body_pos - 1);
- }
-
- tmpx += singleWidth(pos);
-
- if (hfillExpansion(*pit_, row_, pos)) {
- if (pos >= body_pos)
- tmpx += hfill_;
- else
- tmpx += label_hfill_;
- } else {
- if (pit_->isSeparator(pos) && pos >= body_pos)
- tmpx += separator_;
- }
-
- if (((startpit != pit_ && startrow != rit_)
- || text_.selection.start.pos() <= pos) &&
- ((endpit != pit_ && endrow != rit_)
- || pos < text_.selection.end.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);
- }
- }
-
- if ((startpit != pit_ && startrow != rit_ && is_rtl) ||
- (endpit != pit_ && endrow != rit_ && !is_rtl)) {
- pain_.fillRectangle(int(xo_ + tmpx),
- yo_, int(bv_.workWidth() - tmpx), h, LColor::selection);
- }
-}
-
-
void RowPainter::paintChangeBar()
{
pos_type const start = row_.pos();
pos_type const end = row_.endpos();
- if (start == end || !pit_->isChanged(start, end - 1))
+ if (start == end || !par_.isChanged(start, end - 1))
return;
int const height = text_.isLastRow(pit_, row_)
- ? row_.baseline()
- : row_.height() + boost::next(rit_)->top_of_text();
+ ? row_.ascent()
+ : row_.height();
- pain_.fillRectangle(4, yo_, 5, height, LColor::changebar);
+ pain_.fillRectangle(4, yo_ - row_.ascent(), 5, height, LColor::changebar);
}
void RowPainter::paintAppendix()
{
- if (!pit_->params().appendix())
+ if (!par_.params().appendix())
return;
- // FIXME: can be just width_ ?
- int const ww = bv_.workWidth();
+ int y = yo_ - row_.ascent();
- int y = yo_;
-
- if (pit_->params().startOfAppendix())
+ if (par_.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 = par_.getDepth();
if (depth <= 0)
return;
Paragraph::depth_type prev_depth = 0;
if (!text_.isFirstRow(pit_, row_)) {
- ParagraphList::iterator pit2 = pit_;
+ pit_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())
+ pit_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) {
- int const w = PAPER_MARGIN / 5;
- int x = int(w * i + xo_);
- // only consider the changebar space if we're drawing outer left
- if (xo_ == 0)
- x += CHANGEBAR_MARGIN;
- int const h = yo_ + row_.height() - 1 - (i - next_depth - 1) * 3;
+ 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())
+ x += changebarMargin();
+
+ int const starty = yo_ - row_.ascent();
+ int const h = row_.height() - 1 - (i - next_depth - 1) * 3;
- pain_.line(x, yo_, x, h, LColor::depthbar);
+ pain_.line(x, starty, x, starty + h, LColor::depthbar);
if (i > prev_depth)
- pain_.fillRectangle(x, yo_, w, 2, LColor::depthbar);
+ pain_.fillRectangle(x, starty, w, 2, LColor::depthbar);
if (i > next_depth)
- pain_.fillRectangle(x, h, w, 2, LColor::depthbar);
+ pain_.fillRectangle(x, starty + h, w, 2, LColor::depthbar);
}
}
-int RowPainter::paintLengthMarker(string const & prefix, VSpace const & vsp,
- int start)
-{
- if (vsp.kind() == VSpace::NONE)
- return 0;
-
- int const arrow_size = 4;
- int const size = getLengthMarkerHeight(bv_, vsp);
- int const end = start + size;
-
- // the label to display (if any)
- string str;
- // y-values for top arrow
- int ty1, ty2;
- // y-values for bottom arrow
- int by1, by2;
-
- str = prefix + " (" + vsp.asLyXCommand() + ")";
-
- if (vsp.kind() == VSpace::VFILL) {
- ty1 = ty2 = start;
- by1 = by2 = end;
- } else {
- // adding or removing space
- bool const added = vsp.kind() != VSpace::LENGTH ||
- vsp.length().len().value() > 0.0;
- ty1 = added ? (start + arrow_size) : start;
- ty2 = added ? start : (start + arrow_size);
- by1 = added ? (end - arrow_size) : end;
- by2 = added ? end : (end - arrow_size);
- }
-
- int const leftx = int(xo_) + leftMargin();
- int const midx = leftx + arrow_size;
- int const rightx = midx + arrow_size;
-
- // first the string
- int w = 0;
- int a = 0;
- int d = 0;
-
- LyXFont font;
- font.setColor(LColor::added_space);
- font.decSize();
- font.decSize();
- font_metrics::rectText(str, font, w, a, d);
-
- pain_.rectText(leftx + 2 * arrow_size + 5,
- start + (end - start) / 2 + d,
- str, font,
- LColor::none, LColor::none);
-
- // top arrow
- pain_.line(leftx, ty1, midx, ty2, LColor::added_space);
- pain_.line(midx, ty2, rightx, ty1, LColor::added_space);
-
- // bottom arrow
- pain_.line(leftx, by1, midx, by2, LColor::added_space);
- pain_.line(midx, by2, rightx, by1, LColor::added_space);
-
- // joining line
- pain_.line(midx, ty2, midx, by2, LColor::added_space);
-
- return size;
-}
-
-
int RowPainter::paintAppendixStart(int y)
{
LyXFont pb_font;
void RowPainter::paintFirst()
{
- ParagraphParameters const & parparams = pit_->params();
+ ParagraphParameters const & parparams = par_.params();
int y_top = 0;
if (parparams.startOfAppendix())
y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
- // the top margin
- if (text_.isFirstRow(pit_, row_) && !text_.isInInset())
- y_top += PAPER_MARGIN;
-
- // draw the additional space if needed:
- y_top += paintLengthMarker(_("Space above"), parparams.spaceTop(),
- yo_ + y_top);
-
Buffer const & buffer = *bv_.buffer();
- LyXLayout_ptr const & layout = pit_->layout();
+ LyXLayout_ptr const & layout = par_.layout();
if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
- if (pit_ != text_.ownerParagraphs().begin()) {
+ if (pit_ != 0) {
if (layout->latextype == LATEX_PARAGRAPH
- && !pit_->getDepth()) {
+ && !par_.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_seq = isFirstInSequence(pit_, text_.ownerParagraphs());
- //lyxerr << "paintFirst: " << pit_->id() << " is_seq: " << is_seq << std::endl;
+ bool const is_rtl = text_.isRTL(par_);
+ bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
+ //lyxerr << "paintFirst: " << par_.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 (!par_.getLabelstring().empty()) {
double x = x_;
- string const str = pit_->getLabelstring();
+ string const str = par_.getLabelstring();
// 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 (buffer.params().secnumdepth >= 0) {
- float spacing_val = 1.0;
+ double spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
} else {
spacing_val = buffer.params().spacing().getValue();
}
+#warning Look is this correct?
+ int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
- int const maxdesc =
- int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
+ int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
+ int(layout->parsep) * defaultRowHeight();
if (is_rtl) {
- x = ww - leftMargin() -
+ x = width_ - leftMargin() -
font_metrics::width(str, font);
}
- pain_.text(int(x),
- yo_ + row_.baseline() -
- row_.ascent_of_text() - maxdesc,
- str, font);
+ pain_.text(int(x), yo_ - maxdesc - labeladdon, 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)
- font_metrics::width(str, font);
}
- pain_.text(int(x), yo_ + row_.baseline(), str, font);
+ pain_.text(int(x), yo_, str, font);
}
}
layout->labeltype == LABEL_BIBLIO ||
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
LyXFont font = getLabelFont();
- if (!pit_->getLabelstring().empty()) {
- string const str = pit_->getLabelstring();
- float spacing_val = 1.0;
+ if (!par_.getLabelstring().empty()) {
+ string const str = par_.getLabelstring();
+ double spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
} else {
double x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
x = ((is_rtl ? leftMargin() : x_)
- + ww - text_.rightMargin(*pit_, *bv_.buffer())) / 2;
+ + width_ - text_.rightMargin(par_)) / 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),
- yo_ + row_.baseline() - row_.ascent_of_text() - maxdesc,
- str, font);
+ pain_.text(int(x), yo_ - maxdesc, str, font);
}
}
}
void RowPainter::paintLast()
{
- ParagraphParameters const & parparams = pit_->params();
- int y_bottom = row_.height() - 1;
-
- // the bottom margin
- if (text_.isLastRow(pit_, row_) && !text_.isInInset())
- y_bottom -= PAPER_MARGIN;
-
- int const ww = bv_.workWidth();
-
- // draw the additional space if needed:
- int const height = getLengthMarkerHeight(bv_, parparams.spaceBottom());
- y_bottom -= paintLengthMarker(_("Space below"), parparams.spaceBottom(),
- yo_ + y_bottom - height);
-
- bool const is_rtl = pit_->isRightToLeftPar(bv_.buffer()->params());
- int const endlabel = getEndLabel(pit_, text_.ownerParagraphs());
+ bool const is_rtl = text_.isRTL(par_);
+ int const endlabel = getEndLabel(pit_, text_.paragraphs());
// draw an endlabel
switch (endlabel) {
case END_LABEL_FILLED_BOX: {
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 ? LEFT_MARGIN : ww - PAPER_MARGIN - size;
+ int const y = yo_ - size;
+ int x = is_rtl ? nestMargin() + changebarMargin() : 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 = par_.layout()->endlabelstring();
double const x = is_rtl ?
x_ - font_metrics::width(str, font)
- : ww - text_.rightMargin(*pit_, *bv_.buffer()) - row_.fill();
- pain_.text(int(x), yo_ + row_.baseline(), str, font);
+ : - text_.rightMargin(par_) - row_.width();
+ pain_.text(int(x), yo_, str, font);
break;
}
void RowPainter::paintText()
{
pos_type const end = row_.endpos();
- pos_type body_pos = pit_->beginOfBody();
+ pos_type body_pos = par_.beginOfBody();
if (body_pos > 0 &&
- (body_pos > end || !pit_->isLineSeparator(body_pos - 1))) {
+ (body_pos > end || !par_.isLineSeparator(body_pos - 1))) {
body_pos = 0;
}
- LyXLayout_ptr const & layout = pit_->layout();
+ LyXLayout_ptr const & layout = par_.layout();
bool running_strikeout = false;
bool is_struckout = false;
if (x_ > bv_.workWidth())
break;
- pos_type pos = text_.bidi.vis2log(vpos);
+ pos_type const pos = text_.bidi.vis2log(vpos);
- if (pos >= pit_->size()) {
+ if (pos >= par_.size()) {
++vpos;
continue;
}
- if (x_ + singleWidth(pos) < 0) {
- x_ += singleWidth(pos);
+ const int width_pos = singleWidth(pos);
+ if (x_ + width_pos < 0) {
+ x_ += width_pos;
++vpos;
continue;
}
- is_struckout = isDeletedText(*pit_, pos);
+ is_struckout = isDeletedText(par_, 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 = par_.isInset(pos)
+ && isHighlyEditableInset(par_.getInset(pos));
// if we reach the end of a struck out range, paint it
// we also don't paint across things like tables
if (running_strikeout && (highly_editable_inset || !is_struckout)) {
- int const middle = yo_ + (row_.baseline() + row_.top_of_text()) / 2;
+ // FIXME this should take real text height into account, not
+ // the whole row including padding whitespace
+ //int const middle = yo_ + (- row_.ascent() + row_.top_of_text()) / 2;
+ int const middle = yo_ - row_.ascent() / 2;
pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
int const lwidth = font_metrics::width(layout->labelsep,
getLabelFont());
- x_ += label_hfill_ + lwidth - singleWidth(body_pos - 1);
+ x_ += label_hfill_ + lwidth - width_pos;
}
- if (pit_->isHfill(pos)) {
+ if (par_.isHfill(pos)) {
x_ += 1;
- int const y0 = yo_ + row_.baseline();
+ int const y0 = yo_;
int const y1 = y0 - defaultRowHeight() / 2;
pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
- if (hfillExpansion(*pit_, row_, pos)) {
+ if (hfillExpansion(par_, row_, pos)) {
int const y2 = (y0 + y1) / 2;
if (pos >= body_pos) {
}
x_ += 2;
++vpos;
- } else if (pit_->isSeparator(pos)) {
- x_ += singleWidth(pos);
+ } else if (par_.isSeparator(pos)) {
+ x_ += width_pos;
if (pos >= body_pos)
x_ += separator_;
++vpos;
// if we reach the end of a struck out range, paint it
if (running_strikeout) {
- int const middle = yo_ + (row_.baseline() + row_.top_of_text()) / 2;
+ //top_of_text = font_metrics::maxAscent(font);
+ //int const middle = yo_ - top_of_text() / 2;
+ int const middle = yo_ - row_.ascent() / 2;
pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
-int paintPars(BufferView const & bv, LyXText const & text,
- ParagraphList::iterator pit, int xo, int yo, int y)
+void paintPar
+ (PainterInfo & pi, LyXText const & text, pit_type pit, int x, int y)
{
- //lyxerr << " paintRows: pit: " << &*pit << endl;
- int const y2 = bv.painter().paperHeight();
- y -= bv.top_y();
-
- ParagraphList::iterator end = text.ownerParagraphs().end();
-
- for ( ; pit != end; ++pit) {
- RowList::iterator row = pit->rows.begin();
- RowList::iterator rend = pit->rows.end();
-
- for ( ; row != rend; ++row) {
- RowPainter(bv, text, pit, row, xo, y + yo);
- y += row->height();
- }
- if (yo + y >= y2)
- break;
+// lyxerr << " paintPar: pit: " << pit << " at y: " << y << endl;
+ static NullPainter nop;
+ static PainterInfo nullpi(pi.base.bv, nop);
+ int const ww = pi.base.bv->workHeight();
+
+ Paragraph & par = text.paragraphs()[pit];
+
+ RowList::iterator const rb = par.rows().begin();
+ RowList::iterator const re = par.rows().end();
+ theCoords.pars_[&text][pit] = Point(x, y);
+
+ y -= rb->ascent();
+ for (RowList::iterator rit = rb; rit != re; ++rit) {
+ y += rit->ascent();
+ bool const inside = (y + rit->descent() >= 0
+ && y - rit->ascent() < ww);
+ RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
+
+ y += rit->descent();
+ rp.paintAppendix();
+ rp.paintDepthBar();
+ rp.paintChangeBar();
+ if (rit == rb)
+ rp.paintFirst();
+ if (rit + 1 == re)
+ rp.paintLast();
+ rp.paintText();
}
-
- return y;
}
} // namespace anon
-int paintText(BufferView & bv)
+void paintText(BufferView const & bv, ViewMetricsInfo const & vi)
{
- ParagraphList::iterator pit;
- bv.text->getRowNearY(bv.top_y(), pit);
- return paintPars(bv, *bv.text, pit, 0, 0, pit->y);
-}
+ Painter & pain = bv.painter();
+ LyXText * const text = bv.text();
+ // clear background
+ pain.fillRectangle(0, vi.y1, bv.workWidth(), vi.y2 - vi.y1,
+ LColor::background);
-void paintTextInset(BufferView & bv, LyXText & text, int xo, int yo)
-{
- paintPars(bv, text, text.ownerParagraphs().begin(), xo, yo, 0);
-}
+ // draw selection
+ PainterInfo pi(const_cast<BufferView *>(&bv), pain);
+ text->drawSelection(pi, 0, 0);
-int getLengthMarkerHeight(BufferView const & bv, VSpace const & vsp)
-{
- if (vsp.kind() == VSpace::NONE)
- return 0;
+ int yy = vi.y1;
+ // draw contents
+ for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) {
+ yy += text->getPar(pit).ascent();
+ paintPar(pi, *bv.text(), pit, 0, yy);
+ yy += text->getPar(pit).descent();
+ }
+
+
+ // paint one paragraph above and one below
+ if (vi.p1 > 0) {
+ text->redoParagraph(vi.p1 - 1);
+ paintPar(pi, *bv.text(), vi.p1 - 1, 0,
+ vi.y1 - text->getPar(vi.p1 - 1).descent());
+ }
- int const arrow_size = 4;
- int const space_size = vsp.inPixels(bv);
+ if (vi.p2 < text->paragraphs().size() - 1) {
+ text->redoParagraph(vi.p2 + 1);
+ paintPar(pi, *bv.text(), vi.p2 + 1, 0,
+ vi.y2 + text->getPar(vi.p2 + 1).ascent());
+ }
- LyXFont font;
- font.decSize();
- int const min_size = max(3 * arrow_size, font_metrics::maxHeight(font));
+ // and grey out above (should not happen later)
+ lyxerr << "par ascent: " << text->getPar(vi.p1).ascent() << endl;
+ if (vi.y1 > 0)
+ pain.fillRectangle(0, 0, bv.workWidth(), vi.y1, LColor::bottomarea);
- if (vsp.length().len().value() < 0.0)
- return min_size;
- else
- return max(min_size, space_size);
+ // and possibly grey out below
+ lyxerr << "par descent: " << text->getPar(vi.p1).ascent() << endl;
+ if (vi.y2 < bv.workHeight())
+ pain.fillRectangle(0, vi.y2, bv.workWidth(), bv.workHeight() - vi.y2, LColor::bottomarea);
+}
+
+
+void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y)
+{
+// lyxerr << " paintTextInset: y: " << y << endl;
+
+ y -= text.getPar(0).ascent();
+ for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
+ y += text.getPar(pit).ascent();
+ paintPar(pi, text, pit, x, y);
+ y += text.getPar(pit).descent();
+ }
}
projects / lyx.git / blobdiff