yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Verify that Shadow pixmaps are valid

Browse source 
At least in rekonq the shadow pixmaps are not valid causing
an exception to be thrown and crashing kwin.
This commit is contained in:
Martin Gräßlin 2011-04-02 19:01:16 +02:00
parent 9f02766fd9
commit c82fed057f
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shadow.cpp
View file

@ -52,7 +52,10 @@ Shadow *Shadow::createShadow(Toplevel *toplevel)
#endif
}
if (shadow) {
shadow->init(data);
if (!shadow->init(data)) {
delete shadow;
return NULL;
}
}
return shadow;
} else {
@ -80,10 +83,13 @@ QVector< long > Shadow::readX11ShadowProperty(WId id)
return ret;
}
void Shadow::init(const QVector< long > &data)
bool Shadow::init(const QVector< long > &data)
{
for (int i=0; i<ShadowElementsCount; ++i) {
QPixmap pix = QPixmap::fromX11Pixmap(data[i]);
if (pix.isNull()) {
return false;
}
m_shadowElements[i] = pix.copy(0, 0, pix.width(), pix.height());
}
m_topOffset = data[ShadowElementsCount];
@ -97,6 +103,7 @@ void Shadow::init(const QVector< long > &data)
const QRect leftRect(- m_leftOffset, - m_topOffset, m_leftOffset, m_topLevel->height() + m_topOffset + m_bottomOffset);
m_shadowRegion = QRegion(topRect).united(rightRect).united(bottomRect).united(leftRect);
buildQuads();
return true;
}
void Shadow::buildQuads()

2
shadow.h
View file

@ -124,7 +124,7 @@ protected:
private:
static QVector<long> readX11ShadowProperty(WId id);
void init(const QVector<long> &data);
bool init(const QVector<long> &data);
Toplevel *m_topLevel;
// shadow pixmaps
QPixmap m_shadowElements[ShadowElementsCount];