X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FQLPainter.C;h=8bec6aecec3254be5f2e025fbe9e56453fb7f4d4;hb=6fdb8bf85a4237cf774cbe68f626642ec2c9e8f6;hp=62976f682d1c785a290c397d15a0c6e4cc37d460;hpb=10d5ea0d8a28c9da3344f73ac860215b89b76e22;p=lyx.git diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C index 62976f682d..8bec6aecec 100644 --- a/src/frontends/qt4/QLPainter.C +++ b/src/frontends/qt4/QLPainter.C @@ -1,5 +1,5 @@ /** - * \file QLPainter.C + * \file QLPainter.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,12 +11,13 @@ #include +#include + #include "QLPainter.h" #include "GuiApplication.h" -#include "GuiWorkArea.h" +#include "GuiFontMetrics.h" #include "QLImage.h" -#include "FontLoader.h" #include "GuiApplication.h" #include "qt_helpers.h" @@ -25,38 +26,17 @@ #include "language.h" #include "LColor.h" -#include "frontends/font_metrics.h" - #include "support/unicode.h" -#include -#include -#include -#include - -using lyx::char_type; -using lyx::docstring; - using std::endl; using std::string; namespace lyx { namespace frontend { -QLPainter::~QLPainter() -{ -} - - -QLPainter::QLPainter(GuiWorkArea * qwa) - : Painter(), qwa_(qwa) -{ -} - - -void QLPainter::start() +QLPainter::QLPainter(QPaintDevice * device) + : QPainter(device), Painter() { - qp_.reset(new QPainter(qwa_->paintDevice())); // new QPainter has default QPen: current_color_ = LColor::black; current_ls_ = line_solid; @@ -64,23 +44,13 @@ void QLPainter::start() } -void QLPainter::end() -{ - qp_->end(); -} - - -int QLPainter::paperWidth() const +QLPainter::~QLPainter() { - return qwa_->viewport()->width(); + QPainter::end(); + //lyxerr << "QLPainter::end()" << endl; } -int QLPainter::paperHeight() const -{ - return qwa_->viewport()->height(); -} - void QLPainter::setQPainterPen(LColor_color col, Painter::line_style ls, Painter::line_width lw) { @@ -91,7 +61,7 @@ void QLPainter::setQPainterPen(LColor_color col, current_ls_ = ls; current_lw_ = lw; - QPen pen = qp_.get()->pen(); + QPen pen = QPainter::pen(); pen.setColor(guiApp->colorCache().get(col)); @@ -105,14 +75,17 @@ void QLPainter::setQPainterPen(LColor_color col, case line_thick: pen.setWidth(3); break; } - qp_.get()->setPen(pen); + setPen(pen); } void QLPainter::point(int x, int y, LColor_color col) { + if (!isDrawingEnabled()) + return; + setQPainterPen(col); - qp_->drawPoint(x, y); + drawPoint(x, y); } @@ -121,8 +94,13 @@ void QLPainter::line(int x1, int y1, int x2, int y2, line_style ls, line_width lw) { + if (!isDrawingEnabled()) + return; + setQPainterPen(col, ls, lw); - qp_->drawLine(x1, y1, x2, y2); + setRenderHint(Antialiasing, x1 != x2 && y1 != y2); + drawLine(x1, y1, x2, y2); + setRenderHint(Antialiasing, false); } @@ -136,13 +114,21 @@ void QLPainter::lines(int const * xp, int const * yp, int np, // Must use new as np is not known at compile time. boost::scoped_array points(new QPoint[np]); + bool antialias = false; for (int i = 0; i < np; ++i) { points[i].setX(xp[i]); points[i].setY(yp[i]); + if (i != 0) + antialias |= xp[i-1] != xp[i] && yp[i-1] != yp[i]; } + if (!isDrawingEnabled()) + return; + setQPainterPen(col, ls, lw); - qp_->drawPolyline(points.get(), np); + setRenderHint(Antialiasing, antialias); + drawPolyline(points.get(), np); + setRenderHint(Antialiasing, false); } @@ -151,97 +137,97 @@ void QLPainter::rectangle(int x, int y, int w, int h, line_style ls, line_width lw) { + if (!isDrawingEnabled()) + return; + setQPainterPen(col, ls, lw); - qp_->drawRect(x, y, w, h); + drawRect(x, y, w, h); } void QLPainter::fillRectangle(int x, int y, int w, int h, LColor_color col) { - qp_->fillRect(x, y, w, h, guiApp->colorCache().get(col)); + fillRect(x, y, w, h, guiApp->colorCache().get(col)); } void QLPainter::arc(int x, int y, unsigned int w, unsigned int h, int a1, int a2, LColor_color col) { + if (!isDrawingEnabled()) + return; + // LyX usings 1/64ths degree, Qt usings 1/16th setQPainterPen(col); - qp_->drawArc(x, y, w, h, a1 / 4, a2 / 4); + setRenderHint(Antialiasing, true); + drawArc(x, y, w, h, a1 / 4, a2 / 4); + setRenderHint(Antialiasing, false); } -void QLPainter::image(int x, int y, int w, int h, - lyx::graphics::Image const & i) +void QLPainter::image(int x, int y, int w, int h, graphics::Image const & i) { - lyx::graphics::QLImage const & qlimage = - static_cast(i); + graphics::QLImage const & qlimage = + static_cast(i); fillRectangle(x, y, w, h, LColor::graphicsbg); - qp_->drawImage(x, y, qlimage.qimage(), 0, 0, w, h); -} - + if (!isDrawingEnabled()) + return; -void QLPainter::text(int x, int y, docstring const & s, LyXFont const & f) -{ - return text(x, y, reinterpret_cast(s.data()), s.length(), f); + drawImage(x, y, qlimage.qimage(), 0, 0, w, h); } -void QLPainter::text(int x, int y, char_type c, LyXFont const & f) +int QLPainter::text(int x, int y, char_type c, LyXFont const & f) { - char_type s[2] = { c, char_type('\0') }; - return text(x, y, s, 1, f); + docstring s(1, c); + return text(x, y, s, f); } -void QLPainter::smallCapsText(int x, int y, +int QLPainter::smallCapsText(int x, int y, QString const & s, LyXFont const & f) { LyXFont smallfont(f); smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE); - QFont const & qfont = guiApp->fontLoader().get(f); - QFont const & qsmallfont = guiApp->fontLoader().get(smallfont); - QFontMetrics const & qfontm = QFontMetrics(qfont); - QFontMetrics const & qsmallfontm = QFontMetrics(qsmallfont); + QFont const & qfont = guiApp->guiFontLoader().get(f); + QFont const & qsmallfont = guiApp->guiFontLoader().get(smallfont); setQPainterPen(f.realColor()); - int tmpx = x; - size_t ls = s.length(); + int textwidth = 0; + size_t const ls = s.length(); for (unsigned int i = 0; i < ls; ++i) { QChar const c = s[i].toUpper(); if (c != s.at(i)) { - qp_->setFont(qsmallfont); - qp_->drawText(tmpx, y, c); - tmpx += qsmallfontm.width(c); + setFont(qsmallfont); } else { - qp_->setFont(qfont); - qp_->drawText(tmpx, y, c); - tmpx += qfontm.width(c); + setFont(qfont); } + if (isDrawingEnabled()) + drawText(x + textwidth, y, c); + textwidth += fontMetrics().width(c); } + return textwidth; } -void QLPainter::text(int x, int y, char_type const * s, size_t ls, - LyXFont const & f) +int QLPainter::text(int x, int y, docstring const & s, + LyXFont const & f) { -#if 0 - Encoding const * encoding = f.language()->encoding(); - if (f.isSymbolFont()) - encoding = encodings.symbol_encoding(); -#endif - -#if 0 - QString str; - str.setLength(ls); - for (unsigned int i = 0; i < ls; ++i) - str[i] = QChar(encoding->ucs(s[i])); -#else - QString str = ucs4_to_qstring(s, ls); -#endif + /* Caution: The following ucs4 to QString conversions work for symbol fonts + only because they are no real conversions but simple casts in reality. + When we want to draw a symbol or calculate the metrics we pass the position + of the symbol in the font (as given in lib/symbols) as a char_type to the + frontend. This is just wrong, because the symbol is no UCS4 character at + all. You can think of this number as the code point of the symbol in a + custom symbol encoding. It works because this char_type is lateron again + interpreted as a position in the font again. + The correct solution would be to have extra functions for symbols, but that + would require to duplicate a lot of frontend and mathed support code. + */ + QString str = toqstr(s); #if 0 // HACK: QT3 refuses to show single compose characters @@ -250,33 +236,51 @@ void QLPainter::text(int x, int y, char_type const * s, size_t ls, str = ' ' + str; #endif + QLFontInfo & fi = guiApp->guiFontLoader().fontinfo(f); + + int textwidth; + if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) { setQPainterPen(f.realColor()); - qp_->setFont(guiApp->fontLoader().get(f)); + if (font() != fi.font) + setFont(fi.font); // We need to draw the text as LTR as we use our own bidi code. - qp_->setLayoutDirection(Qt::LeftToRight); - qp_->drawText(x, y, str); + setLayoutDirection(Qt::LeftToRight); + if (isDrawingEnabled()) { + LYXERR(Debug::PAINTING) << "draw " << std::string(str.toUtf8()) + << " at " << x << "," << y << std::endl; + // Qt4 does not display a glyph whose codepoint is the + // same as that of a soft-hyphen (0x00ad), unless it + // occurs at a line-break. As a kludge, we force Qt to + // render this glyph using a one-column line. + if (s.size() == 1 && str[0].unicode() == 0x00ad) { + QTextLayout adsymbol(str); + adsymbol.setFont(fi.font); + adsymbol.beginLayout(); + QTextLine line = adsymbol.createLine(); + line.setNumColumns(1); + line.setPosition(QPointF(0, -line.ascent())); + adsymbol.endLayout(); + line.draw(this, QPointF(x, y)); + } else + drawText(x, y, str); + } + // Here we use the font width cache instead of + // textwidth = fontMetrics().width(str); + // because the above is awfully expensive on MacOSX + textwidth = fi.metrics->width(str); } else { - smallCapsText(x, y, str, f); + textwidth = smallCapsText(x, y, str, f); } if (f.underbar() == LyXFont::ON) { - underline(f, x, y, font_metrics::width(s, ls, f)); + underline(f, x, y, textwidth); } + return textwidth; } -void QLPainter::drawPixmap(int x, int y, QPixmap const & pixmap) -{ - qp_->drawPixmap(x, y, pixmap); -} - - -void QLPainter::drawImage(int x, int y, QImage const & image) -{ - qp_->drawImage(x, y, image); -} - } // namespace frontend } // namespace lyx +