#include "frontends/font_metrics.h"
#include "frontends/nullpainter.h"
+#include "frontends/LyXView.h"
+#include "frontends/WorkArea.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 {
+/// Flag: do a full redraw of inside text of inset
+/// Working variable indicating a full screen refresh
+bool refreshInside;
+
/**
* A class used for painting an individual row of text.
*/
theCoords.insets().add(inset, int(x_), yo_);
InsetText const * const in = inset->asTextInset();
// non-wide insets are painted completely. Recursive
- bool tmp = bv_.repaintAll();
+ bool tmp = refreshInside;
if (!in || !in->Wide()) {
- bv_.repaintAll(true);
+ refreshInside = true;
lyxerr[Debug::PAINTING] << endl << "Paint inset fully" << endl;
}
- if (bv_.repaintAll())
+ if (refreshInside)
inset->drawSelection(pi, int(x_), yo_);
inset->draw(pi, int(x_), yo_);
- bv_.repaintAll(tmp);
+ refreshInside = tmp;
x_ += inset->width();
}
}
// Draw nikud
- pain_.text(int(x_) + dx, yo_, str, font);
+ docstring dstr(str.begin(), str.end());
+ pain_.text(int(x_) + dx, yo_, dstr, font);
}
}
}
// Draw nikud
- pain_.text(int(x_) + dx, yo_, str, font);
+ docstring dstr(str.begin(), str.end());
+ pain_.text(int(x_) + dx, yo_, dstr, font);
}
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);
+ 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.push_back(par_.getChar(pos));
+#endif
if (arabic) {
- unsigned char c = str[0];
+ char_type c = str[0];
str[0] = par_.transformChar(c, pos);
}
if (arabic)
c = par_.transformChar(c, pos);
+#if 0
str += c;
+#else
+ str.push_back(c);
+#endif
}
if (prev_change == Change::DELETED)
// 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
}
int w = 0;
int a = 0;
int d = 0;
- font_metrics::rectText(label, pb_font, w, a, d);
+ docstring dlab(label.begin(), label.end());
+ font_metrics::rectText(dlab, pb_font, 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, label, pb_font, LColor::none, LColor::none);
+ pain_.rectText(text_start, y + d, dlab, 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);
string 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
if (is_rtl) {
x = width_ - leftMargin() -
- font_metrics::width(str, font);
+ font_metrics::width(dstr, font);
}
- pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+ pain_.text(int(x), yo_ - maxdesc - labeladdon, dstr, font);
} else {
+ string lab = layout->labelsep;
+ docstring dlab(lab.begin(), lab.end());
if (is_rtl) {
x = width_ - leftMargin()
- + font_metrics::width(layout->labelsep, font);
+ + font_metrics::width(dlab, font);
} else {
- x = x_ - font_metrics::width(layout->labelsep, font)
- - font_metrics::width(str, font);
+ x = x_ - font_metrics::width(dlab, font)
+ - font_metrics::width(dstr, font);
}
- pain_.text(int(x), yo_, str, font);
+ pain_.text(int(x), yo_, dstr, font);
}
}
LyXFont font = getLabelFont();
if (!par_.getLabelstring().empty()) {
string const str = par_.getLabelstring();
+ docstring dstr(str.begin(), str.end());
double spacing_val = 1.0;
if (!parparams.spacing().isDefault())
spacing_val = parparams.spacing().getValue();
if (is_rtl)
x = leftMargin();
x += (width_ - text_.rightMargin(par_) - leftMargin()) / 2;
- x -= font_metrics::width(str, font) / 2;
+ x -= font_metrics::width(dstr, font) / 2;
} else if (is_rtl) {
x = width_ - leftMargin() -
- font_metrics::width(str, font);
+ font_metrics::width(dstr, font);
}
- pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
+ pain_.text(int(x), yo_ - maxdesc - labeladdon, dstr, font);
}
}
}
case END_LABEL_STATIC: {
LyXFont font = getLabelFont();
string const & str = par_.layout()->endlabelstring();
+ docstring dstr(str.begin(), str.end());
double const x = is_rtl ?
- x_ - font_metrics::width(str, font)
+ x_ - font_metrics::width(dstr, font)
: - text_.rightMargin(par_) - row_.width();
- pain_.text(int(x), yo_, str, font);
+ pain_.text(int(x), yo_, dstr, font);
break;
}
}
if (body_pos > 0 && pos == body_pos - 1) {
- int const lwidth = font_metrics::width(layout->labelsep,
+ string lab = layout->labelsep;
+ docstring dlab(lab.begin(), lab.end());
+ int const lwidth = font_metrics::width(dlab,
getLabelFont());
x_ += label_hfill_ + lwidth - width_pos;
static PainterInfo nullpi(pi.base.bv, nop);
int const ww = pi.base.bv->workHeight();
+ theCoords.parPos()[&text][pit] = Point(x, y);
+
Paragraph const & par = text.paragraphs()[pit];
+ if (par.rows().empty())
+ return;
RowList::const_iterator const rb = par.rows().begin();
RowList::const_iterator const re = par.rows().end();
- theCoords.parPos()[&text][pit] = Point(x, y);
y -= rb->ascent();
lyx::size_type rowno(0);
for (RowList::const_iterator rit = rb; rit != re; ++rit, ++rowno) {
y += rit->ascent();
- // Allow setting of bv->repaintAll() for nested insets in
+ // Allow setting of refreshInside for nested insets in
// this row only
- bool tmp = pi.base.bv->repaintAll();
+ bool tmp = refreshInside;
// Row signature; has row changed since last paint?
lyx::size_type const row_sig = calculateRowSignature(*rit, par, x, y);
if (in) {
InsetText const * const t = in->asTextInset();
if (t)
- t->Wide() = in_inset_alone_on_row &&
- t->Tall();
+ t->Wide() = in_inset_alone_on_row;
}
}
// (if paragraph background was not cleared)
if (!repaintAll &&
(!in_inset_alone_on_row || row_has_changed)) {
- pi.pain.fillRectangle(( rowno ? 0 : x - 10 ), y - rit->ascent(),
- pi.base.bv->workWidth(), rit->height(),
+ pi.pain.fillRectangle(x, y - rit->ascent(),
+ text.maxwidth_, rit->height(),
text.backgroundColor());
// If outer row has changed, force nested
// insets to repaint completely
if (row_has_changed)
- pi.base.bv->repaintAll(true);
+ refreshInside = true;
}
// Instrumentation for testing row cache (see also
}
y += rit->descent();
// Restore, see above
- pi.base.bv->repaintAll(tmp);
+ refreshInside = tmp;
}
lyxerr[Debug::PAINTING] << "." << endl;
}
} // namespace anon
-void paintText(BufferView const & bv, ViewMetricsInfo const & vi)
+void paintText(BufferView const & bv, ViewMetricsInfo const & vi,
+ Painter & pain)
{
- Painter & pain = bv.painter();
LyXText * const text = bv.text();
bool const select = bv.cursor().selection();
PainterInfo pi(const_cast<BufferView *>(&bv), pain);
// Should the whole screen, including insets, be refreshed?
- bool repaintAll(select || !vi.singlepar);
+ bool repaintAll = select || !vi.singlepar;
if (repaintAll) {
// Clear background (if not delegated to rows)
int yy = vi.y1;
// draw contents
for (pit_type pit = vi.p1; pit <= vi.p2; ++pit) {
- bv.repaintAll(repaintAll);
+ refreshInside = repaintAll;
Paragraph const & par = text->getPar(pit);
yy += par.ascent();
paintPar(pi, *bv.text(), pit, 0, yy, repaintAll);
y -= text.getPar(0).ascent();
// This flag can not be set from within same inset:
- bool repaintAll = pi.base.bv->repaintAll();
+ bool repaintAll = refreshInside;
for (int pit = 0; pit < int(text.paragraphs().size()); ++pit) {
y += text.getPar(pit).ascent();
paintPar(pi, text, pit, x, y, repaintAll);
projects / lyx.git / blobdiff