#include "LColor.h"
#include "lyxrc.h"
#include "lyxrow.h"
-#include "lyxrow_funcs.h"
#include "metricsinfo.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "vspace.h"
-#include "frontends/font_metrics.h"
-#include "frontends/nullpainter.h"
-#include "frontends/LyXView.h"
-#include "frontends/WorkArea.h"
+#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include "insets/insettext.h"
#include <boost/crc.hpp>
-using lyx::docstring;
-using lyx::frontend::Painter;
-using lyx::frontend::NullPainter;
-using lyx::char_type;
-using lyx::pos_type;
-using lyx::pit_type;
+
+namespace lyx {
+
+using frontend::Painter;
+using frontend::FontMetrics;
using std::endl;
using std::max;
private:
void paintForeignMark(double orig_x, LyXFont const & font, int desc = 0);
- void paintHebrewComposeChar(lyx::pos_type & vpos, LyXFont const & font);
- void paintArabicComposeChar(lyx::pos_type & vpos, LyXFont const & font);
- void paintChars(lyx::pos_type & vpos, LyXFont font,
+ void paintHebrewComposeChar(pos_type & vpos, LyXFont const & font);
+ void paintArabicComposeChar(pos_type & vpos, LyXFont const & font);
+ void paintChars(pos_type & vpos, LyXFont const & font,
bool hebrew, bool arabic);
int paintAppendixStart(int y);
- void paintFromPos(lyx::pos_type & vpos);
- void paintInset(lyx::pos_type const pos, LyXFont const & font);
+ void paintFromPos(pos_type & vpos);
+ void paintInset(pos_type const pos, LyXFont const & font);
/// return left margin
int leftMargin() const;
LyXFont const getLabelFont() const;
/// bufferview to paint on
- BufferView const & bv_;
+ BufferView & bv_;
/// Painter to use
Painter & pain_;
erased_(pi.erased_),
xo_(x), yo_(y), width_(text_.width())
{
- RowMetrics m = text_.computeRowMetrics(pit, row_);
+ RowMetrics m = text_.computeRowMetrics(*bv_.buffer(), pit, row_);
x_ = m.x + xo_;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
LyXFont const RowPainter::getLabelFont() const
{
- return text_.getLabelFont(par_);
+ return text_.getLabelFont(*bv_.buffer(), par_);
}
int RowPainter::leftMargin() const
{
- return text_.leftMargin(pit_, row_.pos());
+ return text_.leftMargin(*bv_.buffer(), pit_, row_.pos());
}
bv_.buffer()->params().getFont() :
font;
pi.ltr_pos = (text_.bidi.level(pos) % 2 == 0);
- pi.erased_ = erased_ || isDeletedText(par_, pos);
- theCoords.insets().add(inset, int(x_), yo_);
+ pi.erased_ = erased_ || par_.isDeleted(pos);
+ bv_.coordCache().insets().add(inset, int(x_), yo_);
InsetText const * const in = inset->asTextInset();
// non-wide insets are painted completely. Recursive
bool tmp = refreshInside;
{
pos_type pos = text_.bidi.vis2log(vpos);
- string str;
+ docstring str;
// first char
char_type c = par_.getChar(pos);
str += c;
++vpos;
- int const width = font_metrics::width(c, font);
+ int const width = theFontMetrics(font).width(c);
int dx = 0;
for (pos_type i = pos - 1; i >= 0; --i) {
if (!Encodings::isComposeChar_hebrew(c)) {
if (isPrintableNonspace(c)) {
int const width2 =
- text_.singleWidth(par_, i, c, text_.getFont(par_, i));
+ text_.singleWidth(*bv_.buffer(), par_, i, c,
+ text_.getFont(*bv_.buffer(), par_, i));
+ // FIXME UNICODE
+ // This does not work anymore, and non-ascii
+ // characters in source files are forbidden
+ // anyway.
// dalet / resh
dx = (c == 'ø' || c == 'ã')
? width2 - width
}
// Draw nikud
- docstring dstr(str.begin(), str.end());
- pain_.text(int(x_) + dx, yo_, dstr, font);
+ // FIXME UNICODE
+ pain_.text(int(x_) + dx, yo_, str, font);
}
void RowPainter::paintArabicComposeChar(pos_type & vpos, LyXFont const & font)
{
pos_type pos = text_.bidi.vis2log(vpos);
- string str;
+ docstring str;
// first char
char_type c = par_.getChar(pos);
str += c;
++vpos;
- int const width = font_metrics::width(c, font);
+ int const width = theFontMetrics(font).width(c);
int dx = 0;
for (pos_type i = pos - 1; i >= 0; --i) {
if (!Encodings::isComposeChar_arabic(c)) {
if (isPrintableNonspace(c)) {
int const width2 =
- text_.singleWidth(par_, i, c, text_.getFont(par_, i));
+ text_.singleWidth(*bv_.buffer(), par_, i, c,
+ text_.getFont(*bv_.buffer(), par_, i));
dx = (width2 - width) / 2;
}
break;
}
}
// Draw nikud
- docstring dstr(str.begin(), str.end());
- pain_.text(int(x_) + dx, yo_, dstr, font);
+ pain_.text(int(x_) + dx, yo_, str, font);
}
-
-void RowPainter::paintChars(pos_type & vpos, LyXFont font,
+void RowPainter::paintChars(pos_type & vpos, LyXFont const & font,
bool hebrew, bool arabic)
{
+ // This method takes up 70% of time when typing
pos_type pos = text_.bidi.vis2log(vpos);
pos_type const end = row_.endpos();
FontSpan const font_span = par_.fontSpan(pos);
Change::Type const prev_change = par_.lookupChange(pos).type;
// first character
-#if 0
- string str;
- str += par_.getChar(pos);
-#else
std::vector<char_type> str;
+ str.reserve(100);
str.push_back(par_.getChar(pos));
-#endif
+
if (arabic) {
char_type c = str[0];
str[0] = par_.transformChar(c, pos);
if (pos < font_span.first || pos > font_span.last)
break;
- if (prev_change != par_.lookupChange(pos))
+ if (prev_change != par_.lookupChange(pos).type)
break;
char_type c = par_.getChar(pos);
if (arabic)
c = par_.transformChar(c, pos);
-#if 0
- str += c;
-#else
str.push_back(c);
-#endif
}
- if (prev_change == Change::DELETED)
- font.setColor(LColor::strikeout);
- else if (prev_change == Change::INSERTED)
- font.setColor(LColor::newtext);
-
- // Draw text and set the new x position
- //lyxerr << "paint row: yo_ " << yo_ << "\n";
-#if 0
- pain_.text(int(x_), yo_, str, font);
- x_ += font_metrics::width(str, font);
-#else
- pain_.text(int(x_), yo_, &str[0], str.size(), font);
- x_ += font_metrics::width(&str[0], str.size(), font);
-#endif
+ if (prev_change != Change::UNCHANGED) {
+ LyXFont copy(font);
+ if (prev_change == Change::DELETED) {
+ copy.setColor(LColor::strikeout);
+ } else if (prev_change == Change::INSERTED) {
+ copy.setColor(LColor::newtext);
+ }
+ x_ += pain_.text(int(x_), yo_, &str[0], str.size(), copy);
+ } else {
+ x_ += pain_.text(int(x_), yo_, &str[0], str.size(), font);
+ }
}
void RowPainter::paintFromPos(pos_type & vpos)
{
pos_type const pos = text_.bidi.vis2log(vpos);
- LyXFont orig_font = text_.getFont(par_, pos);
+ LyXFont orig_font = text_.getFont(*bv_.buffer(), par_, pos);
double const orig_x = x_;
? row_.ascent()
: row_.height();
- pain_.fillRectangle(4, yo_ - row_.ascent(), 5, height, LColor::changebar);
+ pain_.fillRectangle(5, yo_ - row_.ascent(), 3, height, LColor::changebar);
}
void RowPainter::paintDepthBar()
{
- Paragraph::depth_type const depth = par_.getDepth();
+ depth_type const depth = par_.getDepth();
if (depth <= 0)
return;
- Paragraph::depth_type prev_depth = 0;
+ depth_type prev_depth = 0;
if (!text_.isFirstRow(pit_, row_)) {
pit_type pit2 = pit_;
if (row_.pos() == 0)
prev_depth = pars_[pit2].getDepth();
}
- Paragraph::depth_type next_depth = 0;
+ depth_type next_depth = 0;
if (!text_.isLastRow(pit_, row_)) {
pit_type pit2 = pit_;
if (row_.endpos() >= pars_[pit2].size())
next_depth = pars_[pit2].getDepth();
}
- for (Paragraph::depth_type i = 1; i <= depth; ++i) {
+ for (depth_type i = 1; i <= depth; ++i) {
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())
+ if (text_.isMainText(*bv_.buffer()))
x += changebarMargin();
int const starty = yo_ - row_.ascent();
pb_font.setColor(LColor::appendix);
pb_font.decSize();
- string const label = lyx::to_utf8(_("Appendix"));
int w = 0;
int a = 0;
int d = 0;
- docstring dlab(label.begin(), label.end());
- font_metrics::rectText(dlab, pb_font, w, a, d);
+
+ docstring const label = _("Appendix");
+ theFontMetrics(pb_font).rectText(label, w, a, d);
int const text_start = int(xo_ + (width_ - w) / 2);
int const text_end = text_start + w;
- pain_.rectText(text_start, y + d, dlab, pb_font, LColor::none, LColor::none);
+ pain_.rectText(text_start, y + d, label, pb_font, LColor::none, LColor::none);
pain_.line(int(xo_ + 1), y, text_start, y, LColor::appendix);
pain_.line(text_end, y, int(xo_ + width_ - 2), y, LColor::appendix);
}
}
- bool const is_rtl = text_.isRTL(par_);
+ bool const is_rtl = text_.isRTL(buffer, par_);
bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
//lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
|| is_seq)) {
LyXFont const font = getLabelFont();
- string const str = par_.getLabelstring();
+ FontMetrics const & fm = theFontMetrics(font);
+
+ docstring const str = par_.getLabelstring();
if (!str.empty()) {
double x = x_;
- docstring dstr(str.begin(), str.end());
// this is special code for the chapter layout. This is
// printed in an extra row and has a pagebreak at
spacing_val = buffer.params().spacing().getValue();
}
- int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
+ int const labeladdon = int(fm.maxHeight() * layout->spacing.getValue() * spacing_val);
- int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
+ int const maxdesc = int(fm.maxDescent() * layout->spacing.getValue() * spacing_val)
+ int(layout->parsep) * defaultRowHeight();
if (is_rtl) {
x = width_ - leftMargin() -
- font_metrics::width(dstr, font);
+ fm.width(str);
}
- pain_.text(int(x), yo_ - maxdesc - labeladdon, dstr, font);
+ pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
} else {
- string lab = layout->labelsep;
- docstring dlab(lab.begin(), lab.end());
+ // FIXME UNICODE
+ docstring lab = from_utf8(layout->labelsep);
if (is_rtl) {
x = width_ - leftMargin()
- + font_metrics::width(dlab, font);
+ + fm.width(lab);
} else {
- x = x_ - font_metrics::width(dlab, font)
- - font_metrics::width(dstr, font);
+ x = x_ - fm.width(lab)
+ - fm.width(str);
}
- pain_.text(int(x), yo_, dstr, font);
+ pain_.text(int(x), yo_, str, font);
}
}
layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
LyXFont font = getLabelFont();
if (!par_.getLabelstring().empty()) {
- string const str = par_.getLabelstring();
- docstring dstr(str.begin(), str.end());
+ docstring const str = par_.getLabelstring();
double spacing_val = 1.0;
if (!parparams.spacing().isDefault())
spacing_val = parparams.spacing().getValue();
else
spacing_val = buffer.params().spacing().getValue();
- int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
+ FontMetrics const & fm = theFontMetrics(font);
+
+ int const labeladdon = int(fm.maxHeight()
+ * layout->spacing.getValue() * spacing_val);
int maxdesc =
- int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val
+ int(fm.maxDescent() * layout->spacing.getValue() * spacing_val
+ (layout->labelbottomsep * defaultRowHeight()));
double x = x_;
if (layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) {
if (is_rtl)
x = leftMargin();
- x += (width_ - text_.rightMargin(par_) - leftMargin()) / 2;
- x -= font_metrics::width(dstr, font) / 2;
+ x += (width_ - text_.rightMargin(buffer, par_) - leftMargin()) / 2;
+ x -= fm.width(str) / 2;
} else if (is_rtl) {
- x = width_ - leftMargin() -
- font_metrics::width(dstr, font);
+ x = width_ - leftMargin() - fm.width(str);
}
- pain_.text(int(x), yo_ - maxdesc - labeladdon, dstr, font);
+ pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
}
}
void RowPainter::paintLast()
{
- bool const is_rtl = text_.isRTL(par_);
+ bool const is_rtl = text_.isRTL(*bv_.buffer(), par_);
int const endlabel = getEndLabel(pit_, text_.paragraphs());
// draw an endlabel
case END_LABEL_BOX:
case END_LABEL_FILLED_BOX: {
LyXFont const font = getLabelFont();
- int const size = int(0.75 * font_metrics::maxAscent(font));
+ FontMetrics const & fm = theFontMetrics(font);
+ int const size = int(0.75 * fm.maxAscent());
int const y = yo_ - size;
int x = is_rtl ? nestMargin() + changebarMargin() : width_ - size;
case END_LABEL_STATIC: {
LyXFont font = getLabelFont();
- string const & str = par_.layout()->endlabelstring();
- docstring dstr(str.begin(), str.end());
+ FontMetrics const & fm = theFontMetrics(font);
+ docstring const & str = par_.layout()->endlabelstring();
double const x = is_rtl ?
- x_ - font_metrics::width(dstr, font)
- : - text_.rightMargin(par_) - row_.width();
- pain_.text(int(x), yo_, dstr, font);
+ x_ - fm.width(str)
+ : - text_.rightMargin(*bv_.buffer(), par_) - row_.width();
+ pain_.text(int(x), yo_, str, font);
break;
}
// Use font span to speed things up, see below
FontSpan font_span;
LyXFont font;
+ Buffer const & buffer = *bv_.buffer();
for (pos_type vpos = row_.pos(); vpos < end; ) {
if (x_ > bv_.workWidth())
// Use font span to speed things up, see above
if (vpos < font_span.first || vpos > font_span.last) {
font_span = par_.fontSpan(vpos);
- font = text_.getFont(par_, vpos);
+ font = text_.getFont(buffer, par_, vpos);
}
- const int width_pos =
- text_.singleWidth(par_, pos, par_.getChar(pos), font);
+ const int width_pos = text_.singleWidth(buffer, par_, pos,
+ par_.getChar(pos), font);
if (x_ + width_pos < 0) {
x_ += width_pos;
continue;
}
- is_struckout = isDeletedText(par_, pos);
+ is_struckout = par_.isDeleted(pos);
if (is_struckout && !running_strikeout) {
running_strikeout = true;
// We also don't paint across things like tables
if (running_strikeout && (highly_editable_inset || !is_struckout)) {
// Calculate 1/3 height of the buffer's default font
- int const middle =
- yo_ -
- font_metrics::maxAscent(bv_.buffer()->params().getFont()) / 3;
+ FontMetrics const & fm
+ = theFontMetrics(bv_.buffer()->params().getFont());
+ int const middle = yo_ - fm.maxAscent() / 3;
pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
if (body_pos > 0 && pos == body_pos - 1) {
- string lab = layout->labelsep;
- docstring dlab(lab.begin(), lab.end());
- int const lwidth = font_metrics::width(dlab,
- getLabelFont());
+ // FIXME UNICODE
+ int const lwidth = theFontMetrics(getLabelFont())
+ .width(from_utf8(layout->labelsep));
x_ += label_hfill_ + lwidth - width_pos;
}
pain_.line(int(x_), y1, int(x_), y0, LColor::added_space);
- if (hfillExpansion(par_, row_, pos)) {
+ if (par_.hfillExpansion(row_, pos)) {
int const y2 = (y0 + y1) / 2;
if (pos >= body_pos) {
// if we reach the end of a struck out range, paint it
if (running_strikeout) {
// calculate 1/3 height of the buffer's default font
- int const middle =
- yo_ -
- font_metrics::maxAscent(bv_.buffer()->params().getFont()) / 3;
+ FontMetrics const & fm
+ = theFontMetrics(bv_.buffer()->params().getFont());
+ int const middle = yo_ - fm.maxAscent() / 3;
pain_.line(last_strikeout_x, middle, int(x_), middle,
LColor::strikeout, Painter::line_solid, Painter::line_thin);
running_strikeout = false;
}
-lyx::size_type calculateRowSignature(Row const & row, Paragraph const & par,
+size_type calculateRowSignature(Row const & row, Paragraph const & par,
int x, int y)
{
boost::crc_32_type crc;
- for (lyx::pos_type i = row.pos(); i < row.endpos(); ++i) {
- const unsigned char b[] = { par.getChar(i) };
+ for (pos_type i = row.pos(); i < row.endpos(); ++i) {
+ char_type const b[] = { par.getChar(i) };
crc.process_bytes(b, 1);
}
- const unsigned char b[] = { x, y, row.width() };
+ char_type const b[] = { x, y, row.width() };
crc.process_bytes(b, 3);
return crc.checksum();
}
{
// Is there a cursor on this row (or inside inset on row)
LCursor & cur = pi.base.bv->cursor();
- for (lyx::size_type d = 0; d < cur.depth(); d++) {
+ for (size_type d = 0; d < cur.depth(); ++d) {
CursorSlice const & sl = cur[d];
if (sl.text() == &text
&& sl.pit() == pit
LCursor & cur = pi.base.bv->cursor();
if (rit->pos() + 1 != rit->endpos())
return false;
- for (lyx::size_type d = 0; d < cur.depth(); d++) {
+ for (size_type d = 0; d < cur.depth(); d++) {
CursorSlice const & sl = cur[d];
if (sl.text() == &text
&& sl.pit() == pit
bool repaintAll)
{
// 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();
- theCoords.parPos()[&text][pit] = Point(x, y);
+ pi.base.bv->coordCache().parPos()[&text][pit] = Point(x, y);
Paragraph const & par = text.paragraphs()[pit];
if (par.rows().empty())
RowList::const_iterator const re = par.rows().end();
y -= rb->ascent();
- lyx::size_type rowno(0);
+ size_type rowno = 0;
for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
y += rit->ascent();
// Allow setting of refreshInside for nested insets in
bool tmp = refreshInside;
// Row signature; has row changed since last paint?
- lyx::size_type const row_sig = calculateRowSignature(*rit, par, x, y);
+ size_type const row_sig = calculateRowSignature(*rit, par, x, y);
bool row_has_changed = par.rowSignature()[rowno] != row_sig;
bool cursor_on_row = CursorOnRow(pi, pit, rit, text);
if (repaintAll || row_has_changed || cursor_on_row) {
// Add to row signature cache
par.rowSignature()[rowno] = row_sig;
-
+
bool const inside = (y + rit->descent() >= 0
- && y - rit->ascent() < ww);
- RowPainter rp(inside ? pi : nullpi, text, pit, *rit, x, y);
+ && y - rit->ascent() < ww);
+ // it is not needed to draw on screen if we are not inside.
+ pi.pain.setDrawingEnabled(inside);
+ RowPainter rp(pi, text, pit, *rit, x, y);
// Clear background of this row
// (if paragraph background was not cleared)
if (!repaintAll &&
// Instrumentation for testing row cache (see also
// 12 lines lower):
- if (text.isMainText())
+ if (text.isMainText(*pi.base.bv->buffer()))
lyxerr[Debug::PAINTING] << "#";
else
lyxerr[Debug::PAINTING] << "[" <<
// Restore, see above
refreshInside = tmp;
}
+ // Re-enable screen drawing for future use of the painter.
+ pi.pain.setDrawingEnabled(true);
+
lyxerr[Debug::PAINTING] << "." << endl;
}
} // namespace anon
-void paintText(BufferView const & bv, ViewMetricsInfo const & vi,
+void paintText(BufferView & bv,
Painter & pain)
{
- LyXText & text = bv.buffer()->text();
+ BOOST_ASSERT(bv.buffer());
+ Buffer const & buffer = *bv.buffer();
+ LyXText & text = buffer.text();
bool const select = bv.cursor().selection();
-
+ ViewMetricsInfo const & vi = bv.viewMetricsInfo();
+
PainterInfo pi(const_cast<BufferView *>(&bv), pain);
// Should the whole screen, including insets, be refreshed?
bool repaintAll = select || !vi.singlepar;
// Try viewing the User Guide Mobius figure
if (vi.p1 > 0) {
- text.redoParagraph(vi.p1 - 1);
- theCoords.parPos()[&text][vi.p1 - 1] =
+ text.redoParagraph(bv, vi.p1 - 1);
+ bv.coordCache().parPos()[&text][vi.p1 - 1] =
Point(0, vi.y1 - text.getPar(vi.p1 - 1).descent());
}
- if (vi.p2 < lyx::pit_type(text.paragraphs().size()) - 1) {
- text.redoParagraph(vi.p2 + 1);
- theCoords.parPos()[&text][vi.p2 + 1] =
+ if (vi.p2 < pit_type(text.paragraphs().size()) - 1) {
+ text.redoParagraph(bv, vi.p2 + 1);
+ bv.coordCache().parPos()[&text][vi.p2 + 1] =
Point(0, vi.y2 + text.getPar(vi.p2 + 1).ascent());
}
y += text.getPar(pit).descent();
}
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff