FCL/sf/mw/qt: comparison src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp

equal deleted inserted replaced

-:2f34d5167611
+:fcece45ef507
 #ifndef QT_NO_DIRECTFB_WM
 , dfbWindow(0)
 #endif
 , flipFlags(flip)
 , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
+, flushPending(false)
 {
 #ifdef QT_NO_DIRECTFB_WM
 mode = Offscreen;
 #endif
 setSurfaceFlags(Opaque | Buffered);
 #ifndef QT_NO_DIRECTFB_WM
 , dfbWindow(0)
 #endif
 , flipFlags(flip)
 , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
+, flushPending(false)
 {
 SurfaceFlags flags = 0;
 if (!widget || widget->window()->windowOpacity() == 0xff)
 flags |= Opaque;
 #ifdef QT_NO_DIRECTFB_WM
 mode = Primary;
 } else {
 mode = Offscreen;
 flags = Buffered;
 }
-#else
-noSystemBackground = widget && widget->testAttribute(Qt::WA_NoSystemBackground);
-if (noSystemBackground)
-flags &= ~Opaque;
 #endif
 setSurfaceFlags(flags);
 #ifdef QT_DIRECTFB_TIMING
 frames = 0;
 timer.start();
 {
 IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer();
 if (!layer)
 qFatal("QDirectFBWindowSurface: Unable to get primary display layer!");
+updateIsOpaque();
 DFBWindowDescription description;
 memset(&description, 0, sizeof(DFBWindowDescription));
+description.flags = DWDESC_CAPS|DWDESC_HEIGHT|DWDESC_WIDTH|DWDESC_POSX|DWDESC_POSY|DWDESC_SURFACE_CAPS|DWDESC_PIXELFORMAT;
 description.caps = DWCAPS_NODECORATION;
-description.flags = DWDESC_CAPS|DWDESC_SURFACE_CAPS|DWDESC_PIXELFORMAT|DWDESC_HEIGHT|DWDESC_WIDTH|DWDESC_POSX|DWDESC_POSY;
+description.surface_caps = DSCAPS_NONE;
-#if (Q_DIRECTFB_VERSION >= 0x010200)
+imageFormat = screen->pixelFormat();
-description.flags |= DWDESC_OPTIONS;
-#endif
+if (!(surfaceFlags() & Opaque)) {
+imageFormat = screen->alphaPixmapFormat();
-if (noSystemBackground) {
 description.caps |= DWCAPS_ALPHACHANNEL;
 #if (Q_DIRECTFB_VERSION >= 0x010200)
+description.flags |= DWDESC_OPTIONS;
 description.options |= DWOP_ALPHACHANNEL;
 #endif
 }
+description.pixelformat = QDirectFBScreen::getSurfacePixelFormat(imageFormat);
 description.posx = rect.x();
 description.posy = rect.y();
 description.width = rect.width();
 description.height = rect.height();
-description.surface_caps = DSCAPS_NONE;
+if (QDirectFBScreen::isPremultiplied(imageFormat))
+description.surface_caps = DSCAPS_PREMULTIPLIED;
 if (screen->directFBFlags() & QDirectFBScreen::VideoOnly)
 description.surface_caps |= DSCAPS_VIDEOONLY;
-const QImage::Format format = (noSystemBackground ? screen->alphaPixmapFormat() : screen->pixelFormat());
-description.pixelformat = QDirectFBScreen::getSurfacePixelFormat(format);
-if (QDirectFBScreen::isPremultiplied(format))
-description.surface_caps = DSCAPS_PREMULTIPLIED;
 DFBResult result = layer->CreateWindow(layer, &description, &dfbWindow);
 if (result != DFB_OK)
 DirectFBErrorFatal("QDirectFBWindowSurface::createWindow", result);
 }
 }
 Q_ASSERT(!dfbSurface);
 dfbWindow->GetSurface(dfbWindow, &dfbSurface);
-updateFormat();
 }
 static DFBResult setWindowGeometry(IDirectFBWindow *dfbWindow, const QRect &old, const QRect &rect)
 {
 DFBResult result = DFB_OK;
 rect.width(), rect.height() };
 result = primarySurface->GetSubSurface(primarySurface, &r, &dfbSurface);
 }
 } else { // mode == Offscreen
 if (!dfbSurface) {
-dfbSurface = screen->createDFBSurface(rect.size(), screen->pixelFormat(), QDirectFBScreen::DontTrackSurface);
+dfbSurface = screen->createDFBSurface(rect.size(), surfaceFlags() & Opaque ? screen->pixelFormat() : screen->alphaPixmapFormat(),
+QDirectFBScreen::DontTrackSurface);
 }
 }
 if (result != DFB_OK)
 DirectFBErrorFatal("QDirectFBWindowSurface::setGeometry()", result);
 #endif
 }
-if (oldSurface != dfbSurface)
+if (oldSurface != dfbSurface) {
-updateFormat();
+imageFormat = dfbSurface ? QDirectFBScreen::getImageFormat(dfbSurface) : QImage::Format_Invalid;
+}
 if (oldRect.size() != rect.size()) {
 QWSWindowSurface::setGeometry(rect);
 } else {
 QWindowSurface::setGeometry(rect);
 void QDirectFBWindowSurface::setPermanentState(const QByteArray &state)
 {
 if (state.size() == sizeof(this)) {
 sibling = *reinterpret_cast<QDirectFBWindowSurface *const*>(state.constData());
 Q_ASSERT(sibling);
-sibling->setSurfaceFlags(surfaceFlags());
+setSurfaceFlags(sibling->surfaceFlags());
 }
 }
-static inline void scrollSurface(IDirectFBSurface *surface, const QRect &r, int dx, int dy)
+bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
 {
+if (!dfbSurface || !(flipFlags & DSFLIP_BLIT) || region.rectCount() != 1)
+return false;
+if (flushPending) {
+dfbSurface->Flip(dfbSurface, 0, DSFLIP_BLIT);
+} else {
+flushPending = true;
+}
+dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
+const QRect r = region.boundingRect();
 const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
-surface->Blit(surface, surface, &rect, r.x() + dx, r.y() + dy);
+dfbSurface->Blit(dfbSurface, dfbSurface, &rect, r.x() + dx, r.y() + dy);
-const DFBRegion region = { rect.x + dx, rect.y + dy, r.right() + dx, r.bottom() + dy };
-surface->Flip(surface, &region, DSFLIP_BLIT);
-}
-bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
-{
-if (!dfbSurface || !(flipFlags & DSFLIP_BLIT) || region.isEmpty())
-return false;
-dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
-if (region.rectCount() == 1) {
-scrollSurface(dfbSurface, region.boundingRect(), dx, dy);
-} else {
-const QVector<QRect> rects = region.rects();
-const int n = rects.size();
-for (int i=0; i<n; ++i) {
-scrollSurface(dfbSurface, rects.at(i), dx, dy);
-}
-}
 return true;
 }
 bool QDirectFBWindowSurface::move(const QPoint &moveBy)
 {
 return;
 const quint8 windowOpacity = quint8(win->windowOpacity() * 0xff);
 const QRect windowGeometry = geometry();
 #ifdef QT_DIRECTFB_WM
-const bool wasNoSystemBackground = noSystemBackground;
-noSystemBackground = win->testAttribute(Qt::WA_NoSystemBackground);
 quint8 currentOpacity;
 Q_ASSERT(dfbWindow);
 dfbWindow->GetOpacity(dfbWindow, &currentOpacity);
 if (currentOpacity != windowOpacity) {
 dfbWindow->SetOpacity(dfbWindow, windowOpacity);
 }
-setOpaque(noSystemBackground || windowOpacity != 0xff);
-if (wasNoSystemBackground != noSystemBackground) {
-releaseSurface();
-dfbWindow->Release(dfbWindow);
-dfbWindow = 0;
-createWindow(windowGeometry);
-win->update();
-return;
-}
 screen->flipSurface(dfbSurface, flipFlags, region, offset);
 #else
-setOpaque(windowOpacity != 0xff);
+setOpaque(windowOpacity == 0xff);
 if (mode == Offscreen) {
 screen->exposeRegion(region.translated(offset + geometry().topLeft()), 0);
 } else {
 screen->flipSurface(dfbSurface, flipFlags, region, offset);
 }
 qDebug("%d fps", int(double(frames) / double(Secs)));
 frames = 0;
 timer.restart();
 }
 #endif
+flushPending = false;
 }
 void QDirectFBWindowSurface::beginPaint(const QRegion &)
 {
 if (!engine) {
 engine = new QDirectFBPaintEngine(this);
 }
+flushPending = true;
 }
 void QDirectFBWindowSurface::endPaint(const QRegion &)
 {
 #ifdef QT_NO_DIRECTFB_SUBSURFACE
 Q_ASSERT(win == widget || win->isAncestorOf(widget));
 return dfbSurface;
 }
-void QDirectFBWindowSurface::updateFormat()
-{
-imageFormat = dfbSurface ? QDirectFBScreen::getImageFormat(dfbSurface) : QImage::Format_Invalid;
-}
 void QDirectFBWindowSurface::releaseSurface()
 {
 if (dfbSurface) {
 #ifdef QT_DIRECTFB_SUBSURFACE
 releaseSubSurface();
 dfbSurface->Release(dfbSurface);
 dfbSurface = 0;
 }
 }
+void QDirectFBWindowSurface::updateIsOpaque()
+{
+const QWidget *win = window();
+Q_ASSERT(win);
+if (win->testAttribute(Qt::WA_OpaquePaintEvent) || win->testAttribute(Qt::WA_PaintOnScreen)) {
+setOpaque(true);
+return;
+}
+if (qFuzzyCompare(static_cast<float>(win->windowOpacity()), 1.0f)) {
+const QPalette &pal = win->palette();
+if (win->autoFillBackground()) {
+const QBrush &autoFillBrush = pal.brush(win->backgroundRole());
+if (autoFillBrush.style() != Qt::NoBrush && autoFillBrush.isOpaque()) {
+setOpaque(true);
+return;
+}
+}
+if (win->isWindow() && !win->testAttribute(Qt::WA_NoSystemBackground)) {
+const QBrush &windowBrush = win->palette().brush(QPalette::Window);
+if (windowBrush.style() != Qt::NoBrush && windowBrush.isOpaque()) {
+setOpaque(true);
+return;
+}
+}
+}
+setOpaque(false);
+}
 QT_END_NAMESPACE
 #endif // QT_NO_QWS_DIRECTFB

changeset 19	fcece45ef507
parent 18	2f34d5167611