* \author various
* \author John Levon
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "language.h"
#include "encoding.h"
#include "lyxtext.h"
-#include "lyxrow.h"
#include "rowpainter.h"
#include "lyxrc.h"
#include "lyxrow_funcs.h"
using namespace lyx::support;
using std::max;
+using std::endl;
using lyx::pos_type;
extern int PAPER_MARGIN;
public:
/// initialise painter
RowPainter(BufferView const & bv, LyXText const & text,
+ ParagraphList::iterator pit,
RowList::iterator rit, int y_offset, int x_offset, int y);
/// do the painting
void paintChangeBar();
void paintFirst();
void paintLast();
- void paintForeignMark(int orig_x, LyXFont const & orig_font);
+ 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);
mutable ParagraphList::iterator pit_;
// Looks ugly - is
- int xo_;
+ double xo_;
int yo_;
- int x_;
+ double x_;
int y_;
int width_;
- int separator_;
- int hfill_;
- int label_hfill_;
+ double separator_;
+ double hfill_;
+ double label_hfill_;
};
+
RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
- RowList::iterator rit,
+ ParagraphList::iterator pit, RowList::iterator rit,
int y_offset, int x_offset, int y)
: bv_(bv), pain_(bv_.painter()), text_(text), row_(rit),
- pit_(rit->par()),
- xo_(x_offset), yo_(y_offset), y_(y)
+ pit_(pit), xo_(x_offset), yo_(y_offset), y_(y)
{}
int RowPainter::singleWidth(lyx::pos_type pos, char c) const
{
- return text_.singleWidth(pit_, pos, c);
+ LyXFont const & font = text_.getFont(pit_, pos);
+ return text_.singleWidth(pit_, pos, c, font);
}
int RowPainter::leftMargin() const
{
- return text_.leftMargin(*row_);
+ return text_.leftMargin(pit_, *row_);
}
PainterInfo pi(perv(bv_));
pi.base.font = getFont(pos);
-#warning metrics?
inset->draw(pi, int(x_), yo_ + row_->baseline());
x_ += inset->width();
}
void RowPainter::paintChars(pos_type & vpos, bool hebrew, bool arabic)
{
pos_type pos = text_.vis2log(vpos);
- pos_type const last = lastPrintablePos(text_, row_);
+ pos_type const last = lastPrintablePos(*pit_, row_);
LyXFont orig_font = getFont(pos);
// first character
}
-void RowPainter::paintForeignMark(int orig_x, LyXFont const & orig_font)
+void RowPainter::paintForeignMark(double orig_x, LyXFont const & orig_font)
{
if (!lyxrc.mark_foreign_language)
return;
LyXFont const & orig_font = getFont(pos);
- int const orig_x = x_;
+ double const orig_x = x_;
char const c = pit_->getChar(pos);
void RowPainter::paintBackground()
{
- int const x = xo_;
+ 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());
if (startrow == row_ && endrow == row_) {
if (startx < endx) {
- x = xo_ + startx;
+ x = int(xo_) + startx;
w = endx - startx;
pain_.fillRectangle(x, y, w, h, LColor::selection);
} else {
- x = xo_ + endx;
+ x = int(xo_) + endx;
w = startx - endx;
pain_.fillRectangle(x, y, w, h, LColor::selection);
}
} else if (startrow == row_) {
- int const x = (is_rtl) ? xo_ : (xo_ + startx);
- int const w = (is_rtl) ? startx : (width_ - startx);
+ int const x = is_rtl ? int(xo_) : int(xo_ + startx);
+ int const w = is_rtl ? startx : (width_ - startx);
pain_.fillRectangle(x, y, w, h, LColor::selection);
} else if (endrow == row_) {
- int const x = (is_rtl) ? (xo_ + endx) : xo_;
- int const w = (is_rtl) ? (width_ - endx) : endx;
+ int const x = is_rtl ? int(xo_ + endx) : int(xo_);
+ int const w = is_rtl ? (width_ - endx) : endx;
pain_.fillRectangle(x, y, w, h, LColor::selection);
} else if (y_ > starty && y_ < endy) {
- pain_.fillRectangle(xo_, y, width_, h, LColor::selection);
+ pain_.fillRectangle(int(xo_), y, width_, h, LColor::selection);
}
return;
} else if (startrow != row_ && endrow != row_) {
if (y_ > starty && y_ < endy) {
int w = width_;
int h = row_->height();
- pain_.fillRectangle(xo_, yo_, w, h, LColor::selection);
+ pain_.fillRectangle(int(xo_), yo_, w, h, LColor::selection);
}
return;
}
if ((startrow != row_ && !is_rtl) || (endrow != row_ && is_rtl))
- pain_.fillRectangle(xo_, yo_, int(x_), row_->height(), LColor::selection);
+ pain_.fillRectangle(int(xo_), yo_,
+ int(x_), row_->height(), LColor::selection);
pos_type const body_pos = pit_->beginningOfBody();
- pos_type const last = lastPrintablePos(text_, row_);
- int tmpx = x_;
+ pos_type const last = lastPrintablePos(*pit_, row_);
+ double tmpx = x_;
for (pos_type vpos = row_->pos(); vpos <= last; ++vpos) {
pos_type pos = text_.vis2log(vpos);
- int const old_tmpx = tmpx;
+ double const old_tmpx = tmpx;
if (body_pos > 0 && pos == body_pos - 1) {
LyXLayout_ptr const & layout = pit_->layout();
LyXFont const lfont = getLabelFont();
tmpx -= singleWidth(body_pos - 1);
}
- if (hfillExpansion(text_, row_, pos)) {
+ if (hfillExpansion(*pit_, row_, pos)) {
tmpx += singleWidth(pos);
if (pos >= body_pos)
tmpx += hfill_;
}
if ((startrow != row_ && is_rtl) || (endrow != row_ && !is_rtl)) {
- pain_.fillRectangle(xo_ + int(tmpx),
+ pain_.fillRectangle(int(xo_ + tmpx),
yo_, int(bv_.workWidth() - tmpx),
row_->height(), LColor::selection);
}
void RowPainter::paintChangeBar()
{
pos_type const start = row_->pos();
- pos_type const end = lastPrintablePos(text_, row_);
+ pos_type const end = lastPrintablePos(*pit_, row_);
if (!pit_->isChanged(start, end))
return;
- int const height = (boost::next(row_) != text_.rows().end()
- ? row_->height() + boost::next(row_)->top_of_text()
- : row_->baseline());
+ int const height = (row_ == text_.lastRow())
+ ? row_->baseline()
+ : row_->height() + boost::next(row_)->top_of_text();
pain_.fillRectangle(4, yo_, 5, height, LColor::changebar);
}
return;
Paragraph::depth_type prev_depth = 0;
- if (row_ != text_.rows().begin())
- prev_depth = boost::prior(row_)->par()->getDepth();
- Paragraph::depth_type next_depth = 0;
+ if (row_ != text_.firstRow()) {
+ ParagraphList::iterator pit2 = pit_;
+ if (row_ == pit2->rows.begin())
+ --pit2;
+ prev_depth = pit2->getDepth();
+ }
- RowList::iterator next_row = boost::next(row_);
- if (next_row != text_.rows().end())
- next_depth = next_row->par()->getDepth();
+ Paragraph::depth_type next_depth = 0;
+ if (row_ != text_.lastRow()) {
+ ParagraphList::iterator pit2 = pit_;
+ if (boost::next(row_) == pit2->rows.end())
+ ++pit2;
+ next_depth = pit2->getDepth();
+ }
for (Paragraph::depth_type i = 1; i <= depth; ++i) {
- int x = (PAPER_MARGIN / 5) * i + xo_;
+ 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_)
x += CHANGEBAR_MARGIN;
pain_.line(x, yo_, x, h, LColor::depthbar);
- int const w = PAPER_MARGIN / 5;
-
- if (i > prev_depth) {
+ if (i > prev_depth)
pain_.fillRectangle(x, yo_, w, 2, LColor::depthbar);
- }
- if (i > next_depth) {
+ if (i > next_depth)
pain_.fillRectangle(x, h, w, 2, LColor::depthbar);
- }
}
}
by2 = added ? end : (end - arrow_size);
}
- int const leftx = xo_ + leftMargin();
+ int const leftx = int(xo_) + leftMargin();
int const midx = leftx + arrow_size;
int const rightx = midx + arrow_size;
int d = 0;
font_metrics::rectText(label, pb_font, w, a, d);
- int const text_start = xo_ + ((width_ - w) / 2);
+ int const text_start = int(xo_ + (width_ - w) / 2);
int const text_end = text_start + w;
pain_.rectText(text_start, y + d, label, pb_font);
- pain_.line(xo_, y, text_start, y,
+ pain_.line(int(xo_), y, text_start, y,
LColor::pagebreak, Painter::line_onoffdash);
- pain_.line(text_end, y, xo_ + width_, y,
+ pain_.line(text_end, y, int(xo_ + width_), y,
LColor::pagebreak, Painter::line_onoffdash);
return 3 * defaultRowHeight();
int d = 0;
font_metrics::rectText(label, pb_font, w, a, d);
- int const text_start = xo_ + ((width_ - w) / 2);
+ int const text_start = int(xo_ + (width_ - w) / 2);
int const text_end = text_start + w;
pain_.rectText(text_start, y + d, label, pb_font);
- pain_.line(xo_ + 1, y, text_start, y, LColor::appendix);
- pain_.line(text_end, y, xo_ + width_ - 2, y, LColor::appendix);
+ pain_.line(int(xo_ + 1), y, text_start, y, LColor::appendix);
+ pain_.line(text_end, y, int(xo_ + width_ - 2), y, LColor::appendix);
return 3 * defaultRowHeight();
}
int y_top = 0;
// start of appendix?
- if (parparams.startOfAppendix()) {
+ if (parparams.startOfAppendix())
y_top += paintAppendixStart(yo_ + y_top + 2 * defaultRowHeight());
- }
// the top margin
- if (row_ == text_.rows().begin() && !text_.isInInset())
+ if (row_ == text_.firstRow() && !text_.isInInset())
y_top += PAPER_MARGIN;
// draw a top pagebreak
- if (parparams.pagebreakTop()) {
+ if (parparams.pagebreakTop())
y_top += paintPageBreak(_("Page Break (top)"),
yo_ + y_top + 2 * defaultRowHeight());
- }
// draw the additional space if needed:
y_top += paintLengthMarker(_("Space above"), parparams.spaceTop(),
yo_ + y_top);
- Buffer const * buffer = bv_.buffer();
+ Buffer const & buffer = *bv_.buffer();
LyXLayout_ptr const & layout = pit_->layout();
- if (buffer->params.paragraph_separation == BufferParams::PARSEP_SKIP) {
+ if (buffer.params.paragraph_separation == BufferParams::PARSEP_SKIP) {
if (pit_ != text_.ownerParagraphs().begin()) {
if (layout->latextype == LATEX_PARAGRAPH
&& !pit_->getDepth()) {
- y_top += buffer->params.getDefSkip().inPixels(bv_);
+ y_top += buffer.params.getDefSkip().inPixels(bv_);
} else {
LyXLayout_ptr const & playout =
boost::prior(pit_)->layout();
if (playout->latextype == LATEX_PARAGRAPH
&& !boost::prior(pit_)->getDepth()) {
// is it right to use defskip here, too? (AS)
- y_top += buffer->params.getDefSkip().inPixels(bv_);
+ y_top += buffer.params.getDefSkip().inPixels(bv_);
}
}
}
LyXFont font = getLabelFont();
if (!pit_->getLabelstring().empty()) {
- int x = x_;
+ double x = x_;
string const str = pit_->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->labeltype == LABEL_COUNTER_CHAPTER) {
- if (buffer->params.secnumdepth >= 0) {
+ if (buffer.params.secnumdepth >= 0) {
float spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
} else {
- spacing_val = buffer->params.spacing.getValue();
+ spacing_val = buffer.params.spacing.getValue();
}
int const maxdesc =
font_metrics::width(str, font);
}
- pain_.text(x,
+ pain_.text(int(x),
yo_ + row_->baseline() -
row_->ascent_of_text() - maxdesc,
str, font);
- font_metrics::width(str, font);
}
- pain_.text(x, yo_ + row_->baseline(), str, font);
+ pain_.text(int(x), yo_ + row_->baseline(), str, font);
}
}
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
} else {
- spacing_val = buffer->params.spacing.getValue();
+ spacing_val = buffer.params.spacing.getValue();
}
int maxdesc =
int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val
+ (layout->labelbottomsep * defaultRowHeight()));
- int x = x_;
+ double x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
x = ((is_rtl ? leftMargin() : x_)
- + ww - text_.rightMargin(*bv_.buffer(), *row_)) / 2;
+ + ww - text_.rightMargin(pit_, *bv_.buffer(), *row_)) / 2;
x -= font_metrics::width(str, font) / 2;
} else if (is_rtl) {
x = ww - leftMargin() -
font_metrics::width(str, font);
}
- pain_.text(x, yo_ + row_->baseline()
- - row_->ascent_of_text() - maxdesc,
+ pain_.text(int(x),
+ yo_ + row_->baseline() - row_->ascent_of_text() - maxdesc,
str, font);
}
}
int y_bottom = row_->height() - 1;
// the bottom margin
- if (boost::next(row_) == text_.rows().end() && !text_.isInInset())
+ if (row_ == text_.lastRow() && !text_.isInInset())
y_bottom -= PAPER_MARGIN;
int const ww = bv_.workWidth();
y_bottom -= asc;
int const w = text_.isInInset() ? text_.inset_owner->width() : ww;
- int const xp = static_cast<int>(text_.isInInset() ? xo_ : 0);
+ int const xp = int(text_.isInInset() ? xo_ : 0);
int const y = yo_ + y_bottom;
pain_.line(xp, y, xp + w, y, LColor::topline, Painter::line_solid,
Painter::line_thick);
if (row_->fill() <= size)
x += (size - row_->fill() + 1) * (is_rtl ? -1 : 1);
- if (endlabel == END_LABEL_BOX) {
+ if (endlabel == END_LABEL_BOX)
pain_.rectangle(x, y, size, size, LColor::eolmarker);
- } else {
+ else
pain_.fillRectangle(x, y, size, size, LColor::eolmarker);
- }
break;
}
case END_LABEL_STATIC:
{
LyXFont font = getLabelFont();
string const & str = pit_->layout()->endlabelstring();
- int const x = is_rtl ?
+ double const x = is_rtl ?
x_ - font_metrics::width(str, font)
- : ww - text_.rightMargin(*bv_.buffer(), *row_) - row_->fill();
- pain_.text(x, yo_ + row_->baseline(), str, font);
+ : ww - text_.rightMargin(pit_, *bv_.buffer(), *row_) - row_->fill();
+ pain_.text(int(x), yo_ + row_->baseline(), str, font);
break;
}
case END_LABEL_NO_LABEL:
void RowPainter::paintText()
{
- pos_type const last = lastPrintablePos(text_, row_);
+ pos_type const last = lastPrintablePos(*pit_, row_);
pos_type body_pos = pit_->beginningOfBody();
if (body_pos > 0 &&
- (body_pos - 1 > last ||
- !pit_->isLineSeparator(body_pos - 1))) {
+ (body_pos - 1 > last || !pit_->isLineSeparator(body_pos - 1))) {
body_pos = 0;
}
if (is_struckout && !running_strikeout) {
running_strikeout = true;
- last_strikeout_x = x_;
+ last_strikeout_x = int(x_);
}
bool const highly_editable_inset = pit_->isInset(pos)
// we also don't paint across things like tables
if (running_strikeout && (highly_editable_inset || !is_struckout)) {
int const middle = yo_ + row_->top_of_text()
- + ((row_->baseline() - row_->top_of_text()) / 2);
- pain_.line(last_strikeout_x, middle, x_, middle,
+ + (row_->baseline() - row_->top_of_text()) / 2;
+ pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
int const y0 = yo_ + row_->baseline();
int const y1 = y0 - defaultRowHeight() / 2;
- pain_.line(x_, y1, x_, y0, LColor::added_space);
+ pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
- if (hfillExpansion(text_, row_, pos)) {
+ if (hfillExpansion(*pit_, row_, pos)) {
int const y2 = (y0 + y1) / 2;
if (pos >= body_pos) {
- pain_.line(x_, y2, x_ + hfill_, y2,
+ pain_.line(int(x_), y2, int(x_ + hfill_), y2,
LColor::added_space,
Painter::line_onoffdash);
x_ += hfill_;
} else {
- pain_.line(x_, y2,
- x_ + label_hfill_, y2,
+ pain_.line(int(x_), y2, int(x_ + label_hfill_), y2,
LColor::added_space,
Painter::line_onoffdash);
x_ += label_hfill_;
}
- pain_.line(x_, y1, x_, y0, LColor::added_space);
+ pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
}
x_ += 2;
++vpos;
if (running_strikeout) {
int const middle = yo_ + row_->top_of_text()
+ ((row_->baseline() - row_->top_of_text()) / 2);
- pain_.line(last_strikeout_x, middle, x_, middle,
+ pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
- return;
}
void RowPainter::paint()
{
- width_ = text_.workWidth();
-
- // FIXME: must be a cleaner way here. Aren't these calculations
- // belonging to row metrics ?
- text_.prepareToPrint(row_, x_, separator_, hfill_, label_hfill_);
+ width_ = text_.workWidth();
+ x_ = row_->x();
+ separator_ = row_->fill_separator();
+ hfill_ = row_->fill_hfill();
+ label_hfill_ = row_->fill_label_hfill();
// FIXME: what is this fixing ?
if (text_.isInInset() && x_ < 0)
paintBackground();
// paint the selection background
- if (text_.selection.set()) {
+ if (text_.selection.set())
paintSelection();
- }
// vertical lines for appendix
paintAppendix();
// changebar
paintChangeBar();
- if (row_->isParStart()) {
+ if (row_->isParStart())
paintFirst();
- }
- if (isParEnd(text_, row_)) {
+ if (isParEnd(*pit_, row_))
paintLast();
- }
// paint text
paintText();
}
+int paintRows(BufferView const & bv, LyXText const & text,
+ ParagraphList::iterator pit, RowList::iterator rit,
+ int xo, int y, int yf, int yo)
+{
+ //lyxerr << " paintRows: rit: " << &*rit << endl;
+ //const_cast<LyXText&>(text).updateRowPositions();
+ int const yy = yf - y;
+ int const y2 = bv.painter().paperHeight();
+
+ ParagraphList::iterator end = text.ownerParagraphs().end();
+ bool active = false;
+
+ for ( ; pit != end; ++pit) {
+ RowList::iterator row = pit->rows.begin();
+ RowList::iterator rend = pit->rows.end();
+
+ for ( ; row != rend; ++row) {
+ if (row == rit)
+ active = true;
+ if (active) {
+ RowPainter painter(bv, text, pit, row, y + yo, xo, y + bv.top_y());
+ painter.paint();
+ y += row->height();
+ if (yy + y >= y2)
+ return y;
+ } else {
+ //lyxerr << " paintRows: row: " << &*row << " ignored" << endl;
+ }
+ }
+ }
+
+ return y;
+}
+
} // namespace anon
+int paintText(BufferView & bv)
+{
+ int const topy = bv.top_y();
+ ParagraphList::iterator pit;
+ RowList::iterator rit = bv.text->getRowNearY(topy, pit);
+ int y = rit->y() - topy;
+ return paintRows(bv, *bv.text, pit, rit, 0, y, y, 0);
+}
+
+
+void paintTextInset(BufferView & bv, LyXText & text, int x, int baseline)
+{
+ RowList::iterator rit = text.firstRow();
+ RowList::iterator end = text.endRow();
+ ParagraphList::iterator pit = text.ownerParagraphs().begin();
+
+ int y_offset = baseline - rit->ascent_of_text();
+ int y = y_offset;
+ while (rit != end && y + rit->height() <= 0) {
+ y += rit->height();
+ text.nextRow(pit, rit);
+ }
+ if (y_offset < 0)
+ paintRows(bv, text, pit, rit, x, 0, y, y);
+ else
+ paintRows(bv, text, pit, rit, x, 0, y_offset, y_offset);
+}
+
+
int getLengthMarkerHeight(BufferView const & bv, VSpace const & vsp)
{
if (vsp.kind() == VSpace::NONE)
else
return max(min_size, space_size);
}
-
-
-void paintRows(BufferView const & bv, LyXText const & text,
- RowList::iterator rit, int y_offset, int x_offset, int y)
-{
- // fix up missing metrics() call for main LyXText
- // calling metrics() directly is (a) slow and (b) crashs
- if (&text == bv.text) {
-#if 1
- // make sure all insets are updated
- ParagraphList::iterator pit = text.ownerParagraphs().begin();
- ParagraphList::iterator end = text.ownerParagraphs().end();
-
- // compute inset metrics
- for (; pit != end; ++pit) {
- InsetList & insetList = pit->insetlist;
- InsetList::iterator ii = insetList.begin();
- InsetList::iterator iend = insetList.end();
- for (; ii != iend; ++ii) {
- Dimension dim;
- LyXFont font;
- MetricsInfo mi(perv(bv), font, text.workWidth());
- ii->inset->metrics(mi, dim);
- }
- }
-#else
- LyXFont font;
- Dimension dim;
- MetricsInfo mi(perv(bv), font, text.workWidth());
- const_cast<LyXText&>(text).metrics(mi, dim);
-#endif
- }
-
- RowPainter painter(bv, text, rit, y_offset, x_offset, y);
- painter.paint();
-}
projects / lyx.git / blobdiff