Abdelrazak Younes a écrit :
OK, this was just a trial... I am going to revert the cursor changes as
Angus explained in another mail because this make sense to me.
But on the subject of QPixmap vs QImage in QWorkArea, I would like to
continue investigating this route a bit.
Here is a new approach:
1) Cursor handing is done on the server -> use QPixmap
2) Pixel manipulation is done on the client -> paint_device_ is a QImage
3) an intermediate Screen device is updated whenever expose is called ->
sreen_device_ is a QPixmap. This screen_device is the one that is
painted on screen in QWorkArea::repaintEvent().
On windows, I cannot see any degradation in performance due to this
"double-buffering" but I expect a boost under X11 over the network.
With the new methods in QWorkArea, it should be straight forward to
revert to a QPixmap only solution: erase the update() and modify
copyScreen() and drawScreen().
I need some tester on X11 (and Mac if possible) before I could commit that.
Abdel.
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPainter.C
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPainter.C (revision 13409)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPainter.C (working copy)
@@ -39,22 +39,11 @@
}
QLPainter::QLPainter(QWorkArea * qwa)
- : Painter(), paint_check_(0), qwa_(qwa)
+ : Painter(), qwa_(qwa)
{
}
-void QLPainter::start()
-{
-}
-
-void QLPainter::end()
-{
-// if (qp_->isActive())
-// qp_->end();
-}
-
-
int QLPainter::paperWidth() const
{
return qwa_->viewport()->width();
@@ -66,29 +55,6 @@
return qwa_->viewport()->height();
}
-/*
-QPainter & QLPainter::setPen(LColor_color c,
- Painter::line_style ls, Painter::line_width lw)
-{
- QPen pen = qp_->pen();
-
- pen.setColor(lcolorcache.get(c));
-
- switch (ls) {
- case line_solid: pen.setStyle(Qt::SolidLine); break;
- case line_onoffdash: pen.setStyle(Qt::DotLine); break;
- }
-
- switch (lw) {
- case line_thin: pen.setWidth(0); break;
- case line_thick: pen.setWidth(3); break;
- }
-
- qp_->setPen(pen);
-
- return *qp_;
-}
-*/
QPainter & QLPainter::setQPainterPen(QPainter & qp, LColor_color c,
Painter::line_style ls, Painter::line_width lw)
{
@@ -113,7 +79,7 @@
void QLPainter::point(int x, int y, LColor_color c)
{
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
setQPainterPen(qp, c).drawPoint(x, y);
}
@@ -123,7 +89,7 @@
line_style ls,
line_width lw)
{
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
setQPainterPen(qp, col, ls, lw).drawLine(x1, y1, x2, y2);
}
@@ -143,7 +109,7 @@
points[i].setY(yp[i]);
}
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
setQPainterPen(qp, col, ls, lw).drawPolyline(points.get(), np);
}
@@ -153,18 +119,14 @@
line_style ls,
line_width lw)
{
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
setQPainterPen(qp, col, ls, lw).drawRect(x, y, w, h);
}
void QLPainter::fillRectangle(int x, int y, int w, int h, LColor_color col)
{
-// lyxerr[Debug::GRAPHICS] << BOOST_CURRENT_FUNCTION
-// << "\nx=" << x << " y=" << y << " w=" << w << " h=" << h
-// << " LColor " << col << endl;
-
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
qp.fillRect(x, y, w, h, lcolorcache.get(col));
}
@@ -180,7 +142,7 @@
points[i].setY(yp[i]);
}
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
setQPainterPen(qp, col);
qp.setBrush(lcolorcache.get(col));
qp.drawPolygon(points.get(), np);
@@ -192,7 +154,7 @@
int a1, int a2, LColor_color col)
{
// LyX usings 1/64ths degree, Qt usings 1/16th
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
setQPainterPen(qp, col).drawArc(x, y, w, h, a1 / 4, a2 / 4);
}
@@ -205,7 +167,7 @@
fillRectangle(x, y, w, h, LColor::graphicsbg);
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
qp.drawImage(x, y, qlimage.qimage(), 0, 0, w, h);
}
@@ -234,7 +196,7 @@
QFontMetrics const & qfontm = QFontMetrics(qfont);
QFontMetrics const & qsmallfontm = QFontMetrics(qsmallfont);
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
int tmpx = x;
size_t ls = s.length();
for (size_t i = 0; i < ls; ++i) {
@@ -256,7 +218,7 @@
void QLPainter::text(int x, int y, char const * s, size_t ls,
LyXFont const & f)
{
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
setQPainterPen(qp, f.realColor());
Encoding const * encoding = f.language()->encoding();
@@ -288,8 +250,14 @@
}
/// draw a pixmap from the image cache
-void QLPainter::pixmap(int x, int y, QPixmap const & pixmap)
+void QLPainter::drawPixmap(int x, int y, QPixmap const & pixmap)
{
- QPainter qp(qwa_->pixmap());
+ QPainter qp(qwa_->paintDevice());
qp.drawPixmap(x, y, pixmap);
}
+
+void QLPainter::drawImage(int x, int y, QImage const & image)
+{
+ QPainter qp(qwa_->paintDevice());
+ qp.drawImage(x, y, image);
+}
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPainter.h
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPainter.h (revision 13409)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QLPainter.h (working copy)
@@ -21,7 +21,8 @@
class QPaintDevice;
class QPainter;
class QString;
-class QPixmap;
+class QPixmap;
+class QImage;
class QWorkArea;
/**
@@ -33,11 +34,17 @@
~QLPainter();
- /// begin painting
- virtual void start();
+ /// begin painting
+ /**
+ Not used in the the Qt4 frontend.
+ */
+ virtual void start() {}
/// end painting
- virtual void end();
+ /**
+ Not used in the the Qt4 frontend.
+ */
+ virtual void end() {}
/// return the width of the work area in pixels
virtual int paperWidth() const;
@@ -120,8 +127,11 @@
char c, LyXFont const & f);
/// draw a pixmap from the image cache
- virtual void pixmap(int x, int y, QPixmap const & pixmap);
+ virtual void drawPixmap(int x, int y, QPixmap const & pixmap);
+ /// draw a pixmap from the image cache
+ virtual void drawImage(int x, int y, QImage const & image);
+
private:
/// draw small caps text
void smallCapsText(int x, int y,
@@ -135,9 +145,6 @@
/// our qt painter
boost::scoped_ptr<QPainter> qp_;
- /// recursion check
- int paint_check_;
-
/// the working area
QWorkArea * qwa_;
};
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/qscreen.C
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/qscreen.C (revision 13409)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/qscreen.C (working copy)
@@ -9,19 +9,18 @@
* Full author contact details are available in file CREDITS.
*/
-#include <config.h>
+#include <config.h>
-#include "QWorkArea.h"
-#include "qscreen.h"
-//Added by qt3to4:
-#include <QPixmap>
-#include <QPainter>
-
-#include "debug.h"
-#include "lcolorcache.h"
-
+#include "QWorkArea.h"
+#include "qscreen.h"
+
+#include <QColor>
+#include <QPainter>
#include <QApplication>
+#include "debug.h"
+#include "lcolorcache.h"
+
namespace {
@@ -29,7 +28,7 @@
QScreen::QScreen(QWorkArea & o)
- : LyXScreen(), owner_(o), nocursor_pixmap_(0,0)
+ : LyXScreen(), owner_(o), nocursor_(0,0)
{
}
@@ -46,13 +45,12 @@
void QScreen::expose(int x, int y, int w, int h)
{
- lyxerr[Debug::GUI] << "expose " << w << 'x' << h << '+'
<< x << '+' << y << std::endl;
+ lyxerr[Debug::GUI] << "expose " << w << 'x' << h
+ << '+' << x << '+' << y << std::endl;
- owner_.viewport()->update(x, y, w, h);
-// owner_.update();
+ owner_.update(x, y, w, h);
}
-
void QScreen::showCursor(int x, int y, int h, Cursor_Shape shape)
{
if (!qApp->focusWidget())
@@ -60,11 +58,7 @@
if (x==cursor_x_ && y==cursor_y_ && h==cursor_h_) {
// Draw the new (vertical) cursor using the cached store.
- QLPainter * lp = (QLPainter *) &(owner_.getPainter());
- lp->pixmap(cursor_x_, cursor_y_, vcursor_pixmap_);
- owner_.viewport()->update(
- cursor_x_, cursor_y_,
- cursor_w_, cursor_h_);
+ owner_.drawScreen(cursor_x_, cursor_y_, vcursor_);
return;
}
@@ -91,46 +85,36 @@
// 1 the rectangle of the original screen.
// 2 the vertical line of the cursor.
// 3 the horizontal line of the L-shaped cursor (if necessary).
-
- // Initialise storage for these pixmaps as necessary.
- if (cursor_w_ != nocursor_pixmap_.width() ||
- cursor_h_ != nocursor_pixmap_.height()) {
- nocursor_pixmap_.resize(cursor_w_, cursor_h_);
- }
-
+
QColor const & required_color = lcolorcache.get(LColor::cursor);
bool const cursor_color_changed = required_color != cursor_color_;
if (cursor_color_changed)
- cursor_color_ = required_color;
+ cursor_color_ = required_color;
+
+ vcursor_ = QPixmap(cursor_w_, cursor_h_);
+ QPainter qp(&vcursor_);
+ qp.fillRect(0, 0, cursor_w_, cursor_h_, cursor_color_);
-// if (cursor_h_ != vcursor_pixmap_.height() || cursor_color_changed) {
-// if (cursor_h_ != vcursor_pixmap_.height())
- vcursor_pixmap_.resize(cursor_w_, cursor_h_);
- vcursor_pixmap_.fill(cursor_color_);
-// }
-
switch (shape) {
case BAR_SHAPE:
break;
case REVERSED_L_SHAPE:
case L_SHAPE:
- if (cursor_w_ != hcursor_pixmap_.width() ||
+ if (cursor_w_ != hcursor_.width() ||
cursor_color_changed) {
- if (cursor_w_ != hcursor_pixmap_.width())
- hcursor_pixmap_.resize(cursor_w_, 1);
- hcursor_pixmap_.fill(cursor_color_);
+ if (cursor_w_ != hcursor_.width())
+ hcursor_ = QImage(cursor_w_, 1,
QImage::Format_RGB32);
+ QPainter qp2(&vcursor_);
+ qp2.fillRect(0, 0, cursor_w_, 1, cursor_color_);
}
break;
}
- // Save the old area (no cursor).
- QPainter qp(&nocursor_pixmap_);
- qp.drawPixmap(0, 0, *owner_.pixmap(),
- cursor_x_, cursor_y_, cursor_w_, cursor_h_);
+ // Save the old area (no cursor).
+ nocursor_ = owner_.copyScreen(cursor_x_, cursor_y_, cursor_w_,
cursor_h_);
// Draw the new (vertical) cursor using the cached store.
- QLPainter * lp = (QLPainter *) &(owner_.getPainter());
- lp->pixmap(cursor_x_, cursor_y_, vcursor_pixmap_);
+ owner_.drawScreen(cursor_x_, cursor_y_, vcursor_);
// Draw the new (horizontal) cursor if necessary.
switch (shape) {
@@ -138,26 +122,17 @@
break;
case REVERSED_L_SHAPE:
case L_SHAPE:
- lp->pixmap(cursor_x_, y + h - 1, hcursor_pixmap_);
+ owner_.drawScreen(cursor_x_, y + h - 1, hcursor_);
break;
}
-
- owner_.viewport()->update(
- cursor_x_, cursor_y_,
- cursor_w_, cursor_h_);
}
void QScreen::removeCursor()
{
// before first showCursor
- if (nocursor_pixmap_.isNull())
+ if (nocursor_.isNull())
return;
- QLPainter * lp = (QLPainter *) &(owner_.getPainter());
- lp->pixmap(cursor_x_, cursor_y_, nocursor_pixmap_);
-
- owner_.viewport()->update(
- cursor_x_, cursor_y_,
- cursor_w_, cursor_h_);
+ owner_.drawScreen(cursor_x_, cursor_y_, nocursor_);
}
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/qscreen.h
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/qscreen.h (revision 13409)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/qscreen.h (working copy)
@@ -4,7 +4,7 @@
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author John Levon
+ * \author John Levon
*
* Full author contact details are available in file CREDITS.
*/
@@ -12,10 +12,12 @@
#ifndef QSCREEN_H
#define QSCREEN_H
-#include "screen.h"
-#include <qcolor.h>
+
+#include "screen.h"
-#include <QPixmap>
+#include <QPixmap>
+
+class QColor;
class QWorkArea;
class WorkArea;
@@ -47,14 +49,10 @@
/// our owning widget
QWorkArea & owner_;
-// QRegion nocursor_region_;
-// QRegion hcursor_region_;
-// QRegion vcursor_region_;
+ QPixmap nocursor_;
+ QPixmap hcursor_;
+ QPixmap vcursor_;
- QPixmap nocursor_pixmap_;
- QPixmap hcursor_pixmap_;
- QPixmap vcursor_pixmap_;
-
//@{ the cursor pixmap position/size
int cursor_x_;
int cursor_y_;
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C (revision 13409)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.C (working copy)
@@ -492,10 +492,12 @@
verticalScrollBar()->setPageStep(viewport()->height());
- pixmap_.reset(new QPixmap(viewport()->width(), viewport()->height()));
+ screen_device_ = QPixmap(viewport()->width(), viewport()->height());
+ paint_device_ = QImage(viewport()->width(), viewport()->height(),
QImage::Format_RGB32);
this->workAreaResize();
-
+
+ /*
lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION
<< "\n QWidget width\t" << this->QWidget::width()
<< "\n QWidget height\t" << this->QWidget::height()
@@ -503,11 +505,21 @@
<< "\n viewport height\t" << viewport()->height()
<< "\n QResizeEvent rect left\t" << rect().left()
<< "\n QResizeEvent rect right\t" << rect().right()
- << endl;
+ << endl;
+ */
}
+void QWorkArea::update(int x, int y, int w, int h)
+{
+ QPainter q(&screen_device_);
+ q.drawImage(x, y, paint_device_.copy(x, y, w, h));
+
+ viewport()->update(x, y, w, h);
+}
+
void QWorkArea::paintEvent(QPaintEvent * e)
-{
+{
+ /*
lyxerr[Debug::GUI] << BOOST_CURRENT_FUNCTION
<< "\n QWidget width\t" << this->width()
<< "\n QWidget height\t" << this->height()
@@ -519,11 +531,23 @@
<< "\n QPaintEvent y\t" << e->rect().y()
<< "\n QPaintEvent w\t" << e->rect().width()
<< "\n QPaintEvent h\t" << e->rect().height()
- << endl;
-
+ << endl;
+ */
QPainter q(viewport());
- q.drawPixmap(e->rect(), *pixmap_.get(), e->rect());
+ q.drawPixmap(e->rect(), screen_device_, e->rect());
}
+
+QPixmap QWorkArea::copyScreen(int x, int y, int w, int h) const
+{
+ return screen_device_.copy(x, y, w, h);
+}
+
+void QWorkArea::drawScreen(int x, int y, QPixmap pixmap)
+{
+ QPainter q(&screen_device_);
+ q.drawPixmap(x, y, pixmap);
+ viewport()->update(x, y, pixmap.width(), pixmap.height());
+}
///////////////////////////////////////////////////////////////
Index: D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.h
===================================================================
--- D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.h (revision 13409)
+++ D:/msys/home/yns/lyx/trunk/src/frontends/qt4/QWorkArea.h (working copy)
@@ -22,13 +22,13 @@
#undef emit
#endif
-#include "funcrequest.h"
-#include "frontends/Timeout.h"
-
#include "WorkArea.h"
#include "QLPainter.h"
#include "LyXView.h"
+#include "funcrequest.h"
+#include "frontends/Timeout.h"
+
#include <QAbstractScrollArea>
#include <QMouseEvent>
#include <QWheelEvent>
@@ -36,9 +36,9 @@
#include <QKeyEvent>
#include <QPaintEvent>
#include <QTimer>
+#include <QImage>
+#include <QPixmap>
-#include <boost/scoped_ptr.hpp>
-
#include <queue>
class Painter;
@@ -130,18 +130,21 @@
/// return the widget's painter
virtual Painter & getPainter() { return (Painter &) painter_; }
- ///
- //virtual QPaintDevice & paintDevice() { return content_->pixmap(); }
-
/// return the backing pixmap
- QPixmap * pixmap() const { return pixmap_.get(); }
+ QPaintDevice * paintDevice() { return &paint_device_; }
+
+ /// update the passed area.
+ void update(int x, int y, int w, int h);
- /// return the widget's painter
- //virtual QLPainter & getQLPainter() const { return painter_; }
+ /// return a screen copy of the defined area.
+ QPixmap copyScreen(int x, int y, int w, int h) const;
- /// get the content pane widget
- QWidget * getContent() const { return viewport(); }
-
+ /// Draw a pixmap onto the backing pixmap.
+ /**
+ QPixmap is implicitely shared so no need to pass by reference.
+ */
+ void drawScreen(int x, int y, QPixmap pixmap);
+
protected:
/// repaint part of the widget
@@ -198,9 +201,12 @@
///
SyntheticMouseEvent synthetic_mouse_event_;
- /// the double buffered pixmap
- boost::scoped_ptr<QPixmap> pixmap_;
+ /// Our client side painting device.
+ QImage paint_device_;
+ /// Our server side painting device.
+ QPixmap screen_device_;
+
/// \todo remove
QTimer step_timer_;
