#include <config.h>
-#include <algorithm>
-
#include "frontends/Painter.h"
#include "frontends/screen.h"
#include "frontends/font_metrics.h"
#include "insets/insettext.h"
#include "ParagraphParameters.h"
+#include "debug.h"
#include "BufferView.h"
#include "buffer.h"
#include "gettext.h"
#include "rowpainter.h"
#include "lyxrc.h"
#include "lyxrow_funcs.h"
+#include "metricsinfo.h"
+
+#include <algorithm>
+
+using namespace lyx::support;
using std::max;
using lyx::pos_type;
return const_cast<BufferView *>(&bv);
}
-} // namespace anon
-
-
-RowPainter::RowPainter(BufferView const & bv,
- LyXText const & text, RowList::iterator rit)
- : bv_(bv), pain_(bv_.painter()), text_(text), row_(rit), pit_(rit->par())
+/**
+ * A class used for painting an individual row of text.
+ */
+class RowPainter {
+public:
+ /// initialise painter
+ RowPainter(BufferView const & bv, LyXText const & text,
+ RowList::iterator rit, int y_offset, int x_offset, int y);
+
+ /// do the painting
+ void paint();
+private:
+ // paint various parts
+ void paintBackground();
+ void paintSelection();
+ void paintAppendix();
+ void paintDepthBar();
+ void paintChangeBar();
+ void paintFirst();
+ void paintLast();
+ void paintForeignMark(int 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 paintPageBreak(string const & label, int y);
+ 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);
+
+ /// return left margin
+ int leftMargin() const;
+
+ /// return the font at the given pos
+ LyXFont const getFont(lyx::pos_type pos) const;
+
+ /// return the label font for this row
+ LyXFont const getLabelFont() const;
+
+ char const transformChar(char c, lyx::pos_type pos) const;
+
+ /// return pixel width for the given pos
+ int singleWidth(lyx::pos_type pos) const;
+ int singleWidth(lyx::pos_type pos, char c) const;
+
+ /// bufferview to paint on
+ BufferView const & bv_;
+
+ /// Painter to use
+ Painter & pain_;
+
+ /// LyXText for the row
+ LyXText const & text_;
+
+ /// The row to paint
+ RowList::iterator row_;
+
+ /// Row's paragraph
+ mutable ParagraphList::iterator pit_;
+
+ // Looks ugly - is
+ int xo_;
+ int yo_;
+ int x_;
+ int y_;
+ int width_;
+ int separator_;
+ int hfill_;
+ int label_hfill_;
+};
+
+RowPainter::RowPainter(BufferView const & bv, LyXText const & text,
+ 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)
{}
void RowPainter::paintInset(pos_type const pos)
{
- Inset * inset = const_cast<Inset*>(pit_->getInset(pos));
-
- lyx::Assert(inset);
+ InsetOld * inset = const_cast<InsetOld*>(pit_->getInset(pos));
- LyXFont const & font = getFont(pos);
+ Assert(inset);
-#warning inset->update FIXME
- inset->update(perv(bv_), false);
-
- inset->draw(perv(bv_), font, yo_ + row_->baseline(), x_);
+ PainterInfo pi(perv(bv_));
+ pi.base.font = getFont(pos);
+#warning metrics?
+ inset->draw(pi, int(x_), yo_ + row_->baseline());
+ x_ += inset->width();
}
{
pos_type pos = text_.vis2log(vpos);
pos_type const last = lastPrintablePos(text_, row_);
- LyXFont orig_font(getFont(pos));
+ LyXFont orig_font = getFont(pos);
// first character
string str;
}
// 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);
x_ += font_metrics::width(str, orig_font);
}
-void RowPainter::paintForeignMark(float const orig_x, LyXFont const & orig_font)
+void RowPainter::paintForeignMark(int orig_x, LyXFont const & orig_font)
{
if (!lyxrc.mark_foreign_language)
return;
LyXFont const & orig_font = getFont(pos);
- float const orig_x = x_;
+ int const orig_x = x_;
char const c = pit_->getChar(pos);
int const endx = text_.selection.end.x();
int const starty = text_.selection.start.y();
int const endy = text_.selection.end.y();
- RowList::iterator startrow = text_.selection.start.row();
- RowList::iterator endrow = text_.selection.end.row();
+ RowList::iterator startrow = text_.getRow(text_.selection.start);
+ RowList::iterator endrow = text_.getRow(text_.selection.end);
if (text_.bidi_same_direction) {
int x;
pos_type const body_pos = pit_->beginningOfBody();
pos_type const last = lastPrintablePos(text_, row_);
- float tmpx = x_;
+ int tmpx = x_;
for (pos_type vpos = row_->pos(); vpos <= last; ++vpos) {
pos_type pos = text_.vis2log(vpos);
- float const old_tmpx = tmpx;
+ int const old_tmpx = tmpx;
if (body_pos > 0 && pos == body_pos - 1) {
LyXLayout_ptr const & layout = pit_->layout();
LyXFont const lfont = getLabelFont();
if (row_ != text_.rows().begin())
prev_depth = boost::prior(row_)->par()->getDepth();
Paragraph::depth_type next_depth = 0;
- if (boost::next(row_) != text_.rows().end())
- next_depth = boost::next(row_)->par()->getDepth();
+
+ RowList::iterator next_row = boost::next(row_);
+ if (next_row != text_.rows().end())
+ next_depth = next_row->par()->getDepth();
for (Paragraph::depth_type i = 1; i <= depth; ++i) {
int x = (PAPER_MARGIN / 5) * i + xo_;
}
-int getLengthMarkerHeight(BufferView const & bv, VSpace const & vsp)
-{
- if (vsp.kind() == VSpace::NONE)
- return 0;
-
- int const arrow_size = 4;
- int const space_size = int(vsp.inPixels(bv));
-
- LyXFont font;
- font.decSize();
- int const min_size = max(3 * arrow_size,
- font_metrics::maxAscent(font)
- + font_metrics::maxDescent(font));
-
- if (vsp.length().len().value() < 0.0)
- return min_size;
- else
- return max(min_size, space_size);
-}
-
-
int RowPainter::paintLengthMarker(string const & prefix, VSpace const & vsp, int start)
{
if (vsp.kind() == VSpace::NONE)
// draw a top line
if (parparams.lineTop()) {
- LyXFont font(LyXFont::ALL_SANE);
int const asc = font_metrics::ascent('x', getFont(0));
y_top += asc;
- int const w = (text_.isInInset() ? text_.inset_owner->width(perv(bv_), font) : ww);
+ int const w = (text_.isInInset() ? text_.inset_owner->width() : ww);
int const xp = static_cast<int>(text_.isInInset() ? xo_ : 0);
pain_.line(xp, yo_ + y_top, xp + w, yo_ + y_top,
LColor::topline, Painter::line_solid,
LyXFont font = getLabelFont();
if (!pit_->getLabelstring().empty()) {
- float x = x_;
+ int x = x_;
string const str = pit_->getLabelstring();
// this is special code for the chapter layout. This is
font_metrics::width(str, font);
}
- pain_.text(int(x),
+ pain_.text(x,
yo_ + row_->baseline() -
row_->ascent_of_text() - maxdesc,
str, font);
- font_metrics::width(str, font);
}
- pain_.text(int(x), yo_ + row_->baseline(), str, font);
+ pain_.text(x, yo_ + row_->baseline(), str, font);
}
}
int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val
+ (layout->labelbottomsep * defaultRowHeight()));
- float x = x_;
+ int x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
x = ((is_rtl ? leftMargin() : x_)
+ ww - text_.rightMargin(*bv_.buffer(), *row_)) / 2;
x = ww - leftMargin() -
font_metrics::width(str, font);
}
- pain_.text(int(x), yo_ + row_->baseline()
+ pain_.text(x, yo_ + row_->baseline()
- row_->ascent_of_text() - maxdesc,
str, font);
}
// draw a bottom line
if (parparams.lineBottom()) {
- LyXFont font(LyXFont::ALL_SANE);
int const asc = font_metrics::ascent('x',
getFont(max(pos_type(0), pit_->size() - 1)));
y_bottom -= asc;
- int const w = (text_.isInInset() ? text_.inset_owner->width(perv(bv_), font) : ww);
+ int const w = text_.isInInset() ? text_.inset_owner->width() : ww;
int const xp = static_cast<int>(text_.isInInset() ? xo_ : 0);
int const y = yo_ + y_bottom;
pain_.line(xp, y, xp + w, y, LColor::topline, Painter::line_solid,
}
case END_LABEL_STATIC:
{
-#if 0
- LyXFont font(LyXFont::ALL_SANE);
- font = getLabelFont();
-#else
LyXFont font = getLabelFont();
-#endif
string const & str = pit_->layout()->endlabelstring();
int const x = is_rtl ?
- int(x_) - font_metrics::width(str, font)
+ x_ - font_metrics::width(str, font)
: ww - text_.rightMargin(*bv_.buffer(), *row_) - row_->fill();
pain_.text(x, yo_ + row_->baseline(), str, font);
break;
bool running_strikeout = false;
bool is_struckout = false;
- float last_strikeout_x = 0.0;
+ int last_strikeout_x = 0;
pos_type vpos = row_->pos();
while (vpos <= last) {
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(int(last_strikeout_x), middle, int(x_), middle,
+ pain_.line(last_strikeout_x, middle, 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 - singleWidth(body_pos - 1);
}
if (pit_->isHfill(pos)) {
int const y0 = yo_ + row_->baseline();
int const y1 = y0 - defaultRowHeight() / 2;
- pain_.line(int(x_), y1, int(x_), y0,
- LColor::added_space);
+ pain_.line(x_, y1, x_, y0, LColor::added_space);
if (hfillExpansion(text_, row_, pos)) {
int const y2 = (y0 + y1) / 2;
if (pos >= body_pos) {
- pain_.line(int(x_), y2,
- int(x_ + hfill_), y2,
+ pain_.line(x_, y2, x_ + hfill_, y2,
LColor::added_space,
Painter::line_onoffdash);
x_ += hfill_;
} else {
- pain_.line(int(x_), y2,
- int(x_ + label_hfill_), y2,
+ pain_.line(x_, y2,
+ x_ + label_hfill_, y2,
LColor::added_space,
Painter::line_onoffdash);
x_ += label_hfill_;
}
- pain_.line(int(x_), y1,
- int(x_), y0,
- LColor::added_space);
+ pain_.line(x_, y1, 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(int(last_strikeout_x), middle, int(x_), middle,
+ pain_.line(last_strikeout_x, middle, x_, middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
}
-void RowPainter::paint(int y_offset, int x_offset, int y)
+void RowPainter::paint()
{
- xo_ = x_offset;
- yo_ = y_offset;
- y_ = y;
- width_ = text_.isInInset()
- ? text_.inset_owner->textWidth(perv(bv_), true) : bv_.workWidth();
+ 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_);
// FIXME: what is this fixing ?
- if (text_.isInInset() && (x_ < 0))
+ if (text_.isInInset() && x_ < 0)
x_ = 0;
x_ += xo_;
// paint text
paintText();
}
+
+
+} // namespace anon
+
+
+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::maxAscent(font)
+ + font_metrics::maxDescent(font));
+
+ if (vsp.length().len().value() < 0.0)
+ return min_size;
+ 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