#include "support/textutils.h"
-
using lyx::pos_type;
+
+using std::endl;
using std::max;
using std::string;
-extern int PAPER_MARGIN;
+extern int NEST_MARGIN;
extern int CHANGEBAR_MARGIN;
-extern int LEFT_MARGIN;
-namespace {
-// "temporary". We'll never get to use more
-// references until we start adding hacks like
-// these until other places catch up.
-BufferView * perv(BufferView const & bv)
-{
- return const_cast<BufferView *>(&bv);
-}
+namespace {
/**
* A class used for painting an individual row of text.
*/
class RowPainter {
public:
- /// initialise painter
+ /// initialise and run 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 paint();
+ ParagraphList::iterator pit, RowList::iterator rit, int xo, int yo);
private:
// paint various parts
void paintBackground();
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);
double xo_;
int yo_;
double x_;
- int y_;
int width_;
double separator_;
double hfill_;
RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
ParagraphList::iterator pit, RowList::iterator rit,
- int y_offset, int x_offset, int y)
+ int xo, int yo)
: bv_(bv), pain_(bv_.painter()), text_(text), rit_(rit), row_(*rit),
- pit_(pit), xo_(x_offset), yo_(y_offset),
- x_(row_.x()), y_(y),
- width_(text_.workWidth()),
+ 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())
-{}
+{
+ //lyxerr << "RowPainter: x: " << x_ << " xo: " << xo << " yo: " << yo
+ // << " pit->y: " << pit_->y
+ // << " row: " << (pit_->size() ? pit_->getChar(row_.pos()) : 'X') << endl;
+ x_ += xo_;
+
+ // background has already been cleared.
+ if (&text_ == bv_.text())
+ paintBackground();
+
+ // paint the selection background
+#warning look here for selection
+ //if (bv_.cursor().selection() && &text_ == bv_.cursor().innerText())
+ // paintSelection();
+
+ // 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();
+}
/// "temporary"
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 = pit_->getInset(pos);
BOOST_ASSERT(inset);
-
- PainterInfo pi(perv(bv_));
+ PainterInfo pi(const_cast<BufferView *>(&bv_));
pi.base.font = getFont(pos);
+ inset->drawSelection(pi, int(x_), yo_ + row_.baseline());
inset->draw(pi, int(x_), yo_ + row_.baseline());
x_ += inset->width();
}
// first char
char c = pit_->getChar(pos);
c = pit_->transformChar(c, pos);
- str +=c;
+ str += c;
++vpos;
LyXFont const & font = getFont(pos);
}
paintForeignMark(orig_x, orig_font);
-
- return;
}
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());
+ LCursor const & cur = bv_.cursor();
+ int const startx = text_.cursorX(cur.selBegin());
+ int const endx = text_.cursorX(cur.selEnd());
+ int const starty = text_.cursorY(cur.selBegin());
+ int const endy = text_.cursorY(cur.selEnd());
+ ParagraphList::iterator startpit = text_.getPar(cur.selBegin());
+ ParagraphList::iterator endpit = text_.getPar(cur.selEnd());
+ RowList::iterator startrow = startpit->getRow(cur.selBegin().pos());
+ RowList::iterator endrow = endpit->getRow(cur.selEnd().pos());
int const h = row_.height();
int const row_y = 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 y = yo_;
int w;
- if (startrow == rit_ && endrow == rit_) {
+ if (sel_on_one_row) {
if (startx < endx) {
- x = int(xo_) + startx;
+ x = startx;
w = endx - startx;
} else {
- x = int(xo_) + endx;
+ x = endx;
w = startx - endx;
}
- pain_.fillRectangle(x, y, w, h, LColor::selection);
- } else if (startrow == rit_) {
- int const x = is_rtl ? int(xo_) : int(xo_ + startx);
+ pain_.fillRectangle(x, yo_, w, h, LColor::selection);
+ } else if (sel_starts_here) {
+ int const x = is_rtl ? 0 : startx;
int const w = is_rtl ? startx : (width_ - startx);
- pain_.fillRectangle(x, y, w, h, LColor::selection);
- } else if (endrow == rit_) {
- int const x = is_rtl ? int(xo_ + endx) : int(xo_);
+ pain_.fillRectangle(x, yo_, w, h, LColor::selection);
+ } else if (sel_ends_here) {
+ int const x = is_rtl ? endx : 0;
int const w = is_rtl ? (width_ - endx) : endx;
- pain_.fillRectangle(x, y, w, h, LColor::selection);
+ pain_.fillRectangle(x, yo_, w, h, LColor::selection);
} else if (row_y > starty && row_y < endy) {
-
- pain_.fillRectangle(int(xo_), y, width_, h, LColor::selection);
- }
- return;
- }
-
- if (startrow != rit_ && endrow != rit_) {
- if (y_ > starty && y_ < endy) {
- int w = width_;
- pain_.fillRectangle(int(xo_), yo_, w, h, LColor::selection);
+ pain_.fillRectangle(int(xo_), yo_, width_, h, LColor::selection);
}
return;
}
- if ((startrow != rit_ && !is_rtl) || (endrow != rit_ && is_rtl))
+ if ((startpit != pit_ && startrow != rit_ && !is_rtl)
+ || (endpit != pit_ && endrow != rit_ && is_rtl))
pain_.fillRectangle(int(xo_), yo_,
int(x_), h, LColor::selection);
tmpx -= singleWidth(body_pos - 1);
}
+ tmpx += singleWidth(pos);
+
if (hfillExpansion(*pit_, row_, pos)) {
- tmpx += singleWidth(pos);
if (pos >= body_pos)
tmpx += hfill_;
else
tmpx += label_hfill_;
- }
-
- else if (pit_->isSeparator(pos)) {
- tmpx += singleWidth(pos);
- if (pos >= body_pos)
- tmpx += separator_;
} else {
- tmpx += singleWidth(pos);
+ if (pit_->isSeparator(pos) && pos >= body_pos)
+ tmpx += separator_;
}
- if ((startrow != rit_ || text_.selection.start.pos() <= pos) &&
- (endrow != rit_ || pos < text_.selection.end.pos())) {
+ if (((startpit != pit_ && startrow != rit_)
+ || cur.selBegin().pos() <= pos) &&
+ ((endpit != pit_ && endrow != rit_)
+ || 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);
}
}
- if ((startrow != rit_ && is_rtl) || (endrow != rit_ && !is_rtl)) {
+ 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);
+ yo_, int(width_ - tmpx), h, LColor::selection);
}
}
return;
// FIXME: can be just width_ ?
- int const ww = bv_.workWidth();
+ int const ww = width_;
int y = yo_;
}
for (Paragraph::depth_type i = 1; i <= depth; ++i) {
- int const w = PAPER_MARGIN / 5;
+ int const w = NEST_MARGIN / 5;
int x = int(w * i + xo_);
// only consider the changebar space if we're drawing outer left
if (xo_ == 0)
}
-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;
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();
if (buffer.params().paragraph_separation == BufferParams::PARSEP_SKIP) {
- if (pit_ != text_.ownerParagraphs().begin()) {
+ if (pit_ != text_.paragraphs().begin()) {
if (layout->latextype == LATEX_PARAGRAPH
&& !pit_->getDepth()) {
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());
+ bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
//lyxerr << "paintFirst: " << pit_->id() << " is_seq: " << is_seq << std::endl;
// should we print a label?
double x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
x = ((is_rtl ? leftMargin() : x_)
- + ww - text_.rightMargin(*pit_, *bv_.buffer())) / 2;
+ + ww - text_.rightMargin(*pit_)) / 2;
x -= font_metrics::width(str, font) / 2;
} else if (is_rtl) {
x = ww - leftMargin() -
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());
+ int const endlabel = getEndLabel(pit_, text_.paragraphs());
// draw an endlabel
switch (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 ? LEFT_MARGIN : ww - PAPER_MARGIN - size;
+ int x = is_rtl ? NEST_MARGIN + CHANGEBAR_MARGIN: ww - size;
if (row_.fill() <= size)
x += (size - row_.fill() + 1) * (is_rtl ? -1 : 1);
string const & str = pit_->layout()->endlabelstring();
double const x = is_rtl ?
x_ - font_metrics::width(str, font)
- : ww - text_.rightMargin(*pit_, *bv_.buffer()) - row_.fill();
+ : ww - text_.rightMargin(*pit_) - row_.fill();
pain_.text(int(x), yo_ + row_.baseline(), str, font);
break;
}
}
-void RowPainter::paint()
+int paintPars(BufferView const & bv, LyXText const & text,
+ ParagraphList::iterator pit, int xo, int yo, int y)
{
- // FIXME: what is this fixing ?
- if (text_.isInInset() && x_ < 0)
- x_ = 0;
- x_ += xo_;
-
- // background has already been cleared.
- if (&text_ == bv_.text)
- paintBackground();
-
- // paint the selection background
- if (text_.selection.set() && &text_ == bv_.cursor().innerText())
- paintSelection();
-
- // 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();
-}
-
-
-int paintRows(BufferView const & bv, LyXText const & text,
- ParagraphList::iterator pit, RowList::iterator rit,
- int xo, int yo, int y)
-{
- //lyxerr << " paintRows: rit: " << &*rit << endl;
- int const yy = yo;
+ //lyxerr << " paintRows: pit: " << &*pit << endl;
int const y2 = bv.painter().paperHeight();
+ y -= bv.top_y();
- ParagraphList::iterator end = text.ownerParagraphs().end();
- bool active = false;
+ ParagraphList::iterator end = text.paragraphs().end();
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();
- } else {
- //lyxerr << " paintRows: row: " << &*row << " ignored" << endl;
- }
+ RowPainter(bv, text, pit, row, xo, y + yo);
+ y += row->height();
}
- if (yy + y >= y2)
- return y;
+ if (yo + y >= y2)
+ break;
}
return y;
} // namespace anon
-int paintText(BufferView & bv)
+int paintText(BufferView const & bv)
{
- int const topy = bv.top_y();
ParagraphList::iterator pit;
- RowList::iterator rit = bv.text->getRowNearY(topy, pit);
- int const y = pit->y + rit->y_offset() - topy;
- return paintRows(bv, *bv.text, pit, rit, 0, 0, y);
+ bv.text()->updateParPositions();
+ bv.text()->getRowNearY(0, pit);
+ lyxerr << "top_y: " << bv.top_y() << " y: " << pit->y << endl;
+ return paintPars(bv, *bv.text(), pit, 0, 0, pit->y);
}
-void paintTextInset(BufferView & bv, LyXText & text, int xo, int baseline)
+void paintTextInset(LyXText const & text, PainterInfo & pi, int xo, int yo)
{
- RowList::iterator rit = text.firstRow();
- ParagraphList::iterator pit = text.ownerParagraphs().begin();
- paintRows(bv, text, pit, rit, xo, baseline - rit->ascent_of_text(), 0);
-}
-
-
-int getLengthMarkerHeight(BufferView const & bv, VSpace const & vsp)
-{
- if (vsp.kind() == VSpace::NONE)
- return 0;
-
- int const arrow_size = 4;
- int const space_size = vsp.inPixels(bv);
-
- LyXFont font;
- font.decSize();
- int const min_size = max(3 * arrow_size, font_metrics::maxHeight(font));
-
- if (vsp.length().len().value() < 0.0)
- return min_size;
- else
- return max(min_size, space_size);
+ paintPars(*pi.base.bv, text, text.paragraphs().begin(), xo, yo, 0);
}
projects / lyx.git / blobdiff