whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead code from QFbWindow and Screen 

The "rect cache" has been #if 0'd out for ever. Do not waste time on
maintaining a vector for nothing.

Change the screen image to be a normal member variable. There is no need
for extra heap allocations.

Task-number: QTBUG-56306
Change-Id: Ib88aa57896bf1a616b8cedbec7490f0a4bf0ba5f
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
bb10
Laszlo Agocs 2016-10-10 09:56:43 +02:00
parent 2e70a86900
commit daf5d3cf13
3 changed files with 50 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/platformsupport/fbconvenience/qfbscreen.cpp
View File

@ -51,19 +51,23 @@
QT_BEGIN_NAMESPACE
QFbScreen::QFbScreen() : mUpdatePending(false), mCursor(0), mGeometry(), mDepth(16), mFormat(QImage::Format_RGB16), mScreenImage(0), mCompositePainter(0), mIsUpToDate(false)
QFbScreen::QFbScreen()
: mUpdatePending(false),
mCursor(0),
mDepth(16),
mFormat(QImage::Format_RGB16),
mPainter(nullptr)
{
}
QFbScreen::~QFbScreen()
{
delete mCompositePainter;
delete mScreenImage;
delete mPainter;
}
void QFbScreen::initializeCompositor()
{
mScreenImage = new QImage(mGeometry.size(), mFormat);
mScreenImage = QImage(mGeometry.size(), mFormat);
scheduleUpdate();
}
@ -93,7 +97,6 @@ void QFbScreen::addWindow(QFbWindow *window)
}
}
}
invalidateRectCache();
setDirty(window->geometry());
QWindow *w = topWindow();
QWindowSystemInterface::handleWindowActivated(w);
@ -103,7 +106,6 @@ void QFbScreen::addWindow(QFbWindow *window)
void QFbScreen::removeWindow(QFbWindow *window)
{
mWindowStack.removeOne(window);
invalidateRectCache();
setDirty(window->geometry());
QWindow *w = topWindow();
QWindowSystemInterface::handleWindowActivated(w);
@ -116,7 +118,6 @@ void QFbScreen::raise(QFbWindow *window)
if (index <= 0)
return;
mWindowStack.move(index, 0);
invalidateRectCache();
setDirty(window->geometry());
QWindow *w = topWindow();
QWindowSystemInterface::handleWindowActivated(w);
@ -129,7 +130,6 @@ void QFbScreen::lower(QFbWindow *window)
if (index == -1 || index == (mWindowStack.size() - 1))
return;
mWindowStack.move(index, mWindowStack.size() - 1);
invalidateRectCache();
setDirty(window->geometry());
QWindow *w = topWindow();
QWindowSystemInterface::handleWindowActivated(w);
@ -142,7 +142,7 @@ QWindow *QFbScreen::topWindow() const
if (fbw->window()->type() == Qt::Window || fbw->window()->type() == Qt::Dialog)
return fbw->window();
}
return 0;
return nullptr;
}
QWindow *QFbScreen::topLevelAt(const QPoint & p) const
@ -151,7 +151,7 @@ QWindow *QFbScreen::topLevelAt(const QPoint & p) const
if (fbw->geometry().contains(p, false) && fbw->window()->isVisible())
return fbw->window();
}
return 0;
return nullptr;
}
int QFbScreen::windowCount() const
@ -161,9 +161,9 @@ int QFbScreen::windowCount() const
void QFbScreen::setDirty(const QRect &rect)
{
QRect intersection = rect.intersected(mGeometry);
QPoint screenOffset = mGeometry.topLeft();
mRepaintRegion += intersection.translated(-screenOffset); // global to local translation
const QRect intersection = rect.intersected(mGeometry);
const QPoint screenOffset = mGeometry.topLeft();
mRepaintRegion += intersection.translated(-screenOffset); // global to local translation
scheduleUpdate();
}
@ -182,140 +182,71 @@ void QFbScreen::setPhysicalSize(const QSize &size)
void QFbScreen::setGeometry(const QRect &rect)
{
delete mCompositePainter;
mCompositePainter = 0;
delete mScreenImage;
delete mPainter;
mPainter = nullptr;
mGeometry = rect;
mScreenImage = new QImage(mGeometry.size(), mFormat);
invalidateRectCache();
mScreenImage = QImage(mGeometry.size(), mFormat);
QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), geometry(), availableGeometry());
resizeMaximizedWindows();
}
void QFbScreen::generateRects()
{
mCachedRects.clear();
QPoint screenOffset = mGeometry.topLeft();
QRegion remainingScreen(mGeometry.translated(-screenOffset)); // global to local translation
for (int i = 0; i < mWindowStack.length(); i++) {
if (remainingScreen.isEmpty())
break;
#if 0
if (!mWindowStack[i]->isVisible())
continue;
if (mWindowStack[i]->isMinimized())
continue;
if (!mWindowStack[i]->testAttribute(Qt::WA_TranslucentBackground)) {
QRect localGeometry = mWindowStack.at(i)->geometry().translated(-screenOffset); // global to local translation
remainingScreen -= localGeometry;
QRegion windowRegion(localGeometry);
windowRegion -= remainingScreen;
for (const QRect &rect : windowRegion)
mCachedRects += QPair<QRect, int>(rect, i);
}
#endif
}
mCachedRects.reserve(mCachedRects.count() + remainingScreen.rectCount());
for (const QRect &rect : remainingScreen)
mCachedRects += QPair<QRect, int>(rect, -1);
mIsUpToDate = true;
}
QRegion QFbScreen::doRedraw()
{
QPoint screenOffset = mGeometry.topLeft();
const QPoint screenOffset = mGeometry.topLeft();
QRegion touchedRegion;
if (mCursor && mCursor->isDirty() && mCursor->isOnScreen()) {
QRect lastCursor = mCursor->dirtyRect();
const QRect lastCursor = mCursor->dirtyRect();
mRepaintRegion += lastCursor;
}
if (mRepaintRegion.isEmpty() && (!mCursor || !mCursor->isDirty())) {
if (mRepaintRegion.isEmpty() && (!mCursor || !mCursor->isDirty()))
return touchedRegion;
}
QVector<QRect> rects = mRepaintRegion.rects();
if (!mIsUpToDate)
generateRects();
if (!mCompositePainter)
mCompositePainter = new QPainter(mScreenImage);
if (!mPainter)
mPainter = new QPainter(&mScreenImage);
const QVector<QRect> rects = mRepaintRegion.rects();
const QRect screenRect = mGeometry.translated(-screenOffset);
for (int rectIndex = 0; rectIndex < mRepaintRegion.rectCount(); rectIndex++) {
QRegion rectRegion = rects[rectIndex];
const QRect rect = rects[rectIndex].intersected(screenRect);
if (rect.isEmpty())
continue;
for (int i = 0; i < mCachedRects.length(); i++) {
QRect screenSubRect = mCachedRects[i].first;
int layer = mCachedRects[i].second;
QRegion intersect = rectRegion.intersected(screenSubRect);
mPainter->setCompositionMode(QPainter::CompositionMode_Source);
mPainter->fillRect(rect, mScreenImage.hasAlphaChannel() ? Qt::transparent : Qt::black);
if (intersect.isEmpty())
for (int layerIndex = mWindowStack.size() - 1; layerIndex != -1; layerIndex--) {
if (!mWindowStack[layerIndex]->window()->isVisible())
continue;
rectRegion -= intersect;
// we only expect one rectangle, but defensive coding...
for (const QRect &rect : intersect) {
bool firstLayer = true;
if (layer == -1) {
mCompositePainter->setCompositionMode(QPainter::CompositionMode_Source);
mCompositePainter->fillRect(rect, mScreenImage->hasAlphaChannel() ? Qt::transparent : Qt::black);
firstLayer = false;
layer = mWindowStack.size() - 1;
}
for (int layerIndex = layer; layerIndex != -1; layerIndex--) {
if (!mWindowStack[layerIndex]->window()->isVisible())
continue;
// if (mWindowStack[layerIndex]->isMinimized())
// continue;
QRect windowRect = mWindowStack[layerIndex]->geometry().translated(-screenOffset);
QRect windowIntersect = rect.translated(-windowRect.left(),
-windowRect.top());
QFbBackingStore *backingStore = mWindowStack[layerIndex]->backingStore();
if (backingStore) {
backingStore->lock();
mCompositePainter->drawImage(rect, backingStore->image(), windowIntersect);
backingStore->unlock();
}
if (firstLayer) {
firstLayer = false;
}
}
const QRect windowRect = mWindowStack[layerIndex]->geometry().translated(-screenOffset);
const QRect windowIntersect = rect.translated(-windowRect.left(), -windowRect.top());
QFbBackingStore *backingStore = mWindowStack[layerIndex]->backingStore();
if (backingStore) {
backingStore->lock();
mPainter->drawImage(rect, backingStore->image(), windowIntersect);
backingStore->unlock();
}
}
}
QRect cursorRect;
if (mCursor && (mCursor->isDirty() || mRepaintRegion.intersects(mCursor->lastPainted()))) {
mCompositePainter->setCompositionMode(QPainter::CompositionMode_SourceOver);
cursorRect = mCursor->drawCursor(*mCompositePainter);
touchedRegion += cursorRect;
mPainter->setCompositionMode(QPainter::CompositionMode_SourceOver);
touchedRegion += mCursor->drawCursor(*mPainter);
}
touchedRegion += mRepaintRegion;
mRepaintRegion = QRegion();
// qDebug() << "QFbScreen::doRedraw" << mWindowStack.size() << mScreenImage->size() << touchedRegion;
return touchedRegion;
}
QFbWindow *QFbScreen::windowForId(WId wid) const
{
for (int i = 0; i < mWindowStack.count(); ++i)
for (int i = 0; i < mWindowStack.count(); ++i) {
if (mWindowStack[i]->winId() == wid)
return mWindowStack[i];
return 0;
}
return nullptr;
}
QFbScreen::Flags QFbScreen::flags() const
@ -324,4 +255,3 @@ QFbScreen::Flags QFbScreen::flags() const
}
QT_END_NAMESPACE

9
src/platformsupport/fbconvenience/qfbscreen_p.h
View File

@ -120,18 +120,13 @@ protected:
int mDepth;
QImage::Format mFormat;
QSizeF mPhysicalSize;
QImage *mScreenImage;
QImage mScreenImage;
private:
void invalidateRectCache() { mIsUpToDate = false; }
void generateRects();
QPainter *mCompositePainter;
QVector<QPair<QRect, int> > mCachedRects;
QPainter *mPainter;
QList<QFbBackingStore*> mPendingBackingStores;
friend class QFbWindow;
bool mIsUpToDate;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(QFbScreen::Flags)

21
src/platformsupport/fbconvenience/qfbwindow.cpp
View File

@ -66,7 +66,6 @@ void QFbWindow::setGeometry(const QRect &rect)
// store previous geometry for screen update
mOldGeometry = geometry();
platformScreen()->invalidateRectCache();
QWindowSystemInterface::handleGeometryChange(window(), rect);
QPlatformWindow::setGeometry(rect);
@ -98,14 +97,11 @@ void QFbWindow::setWindowState(Qt::WindowState state)
{
QPlatformWindow::setWindowState(state);
mWindowState = state;
platformScreen()->invalidateRectCache();
}
void QFbWindow::setWindowFlags(Qt::WindowFlags flags)
{
mWindowFlags = flags;
platformScreen()->invalidateRectCache();
}
Qt::WindowFlags QFbWindow::windowFlags() const
@ -125,20 +121,15 @@ void QFbWindow::lower()
void QFbWindow::repaint(const QRegion &region)
{
QRect currentGeometry = geometry();
QRect dirtyClient = region.boundingRect();
QRect dirtyRegion(currentGeometry.left() + dirtyClient.left(),
currentGeometry.top() + dirtyClient.top(),
dirtyClient.width(),
dirtyClient.height());
QRect mOldGeometryLocal = mOldGeometry;
const QRect currentGeometry = geometry();
const QRect dirtyClient = region.boundingRect();
const QRect dirtyRegion = dirtyClient.translated(currentGeometry.topLeft());
const QRect oldGeometryLocal = mOldGeometry;
mOldGeometry = currentGeometry;
// If this is a move, redraw the previous location
if (mOldGeometryLocal != currentGeometry)
platformScreen()->setDirty(mOldGeometryLocal);
if (oldGeometryLocal != currentGeometry)
platformScreen()->setDirty(oldGeometryLocal);
platformScreen()->setDirty(dirtyRegion);
}
QT_END_NAMESPACE