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

Use setOverlayShape() instead of doing it manually.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=863939
This commit is contained in:
Luboš Luňák 2008-09-23 15:22:25 +00:00
parent e433f92374
commit f8163eac9d
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
composite.cpp
View file

@ -479,6 +479,7 @@ void Workspace::setupOverlay( Window w )
assert( overlay != None );
assert( Extensions::shapeInputAvailable());
XSetWindowBackgroundPixmap( display(), overlay, None );
overlay_shape = QRegion();
setOverlayShape( QRect( 0, 0, displayWidth(), displayHeight()));
if( w != None )
{
@ -508,6 +509,10 @@ void Workspace::hideOverlay()
void Workspace::setOverlayShape( const QRegion& reg )
{
// Avoid setting the same shape again, it causes flicker (apparently it is not a no-op
// and triggers something).
if( reg == overlay_shape )
return;
QVector< QRect > rects = reg.rects();
XRectangle* xrects = new XRectangle[ rects.count() ];
for( int i = 0;
@ -584,25 +589,7 @@ void Workspace::delayedCheckUnredirect()
if( c->unredirected())
reg -= c->geometry();
}
// Avoid setting the same shape again, it causes flicker (apparently it is not a no-op
// and triggers something).
if( reg == overlay_shape )
return;
overlay_shape = reg;
QVector< QRect > rects = reg.rects();
XRectangle* xrects = new XRectangle[ rects.count() ];
for( int i = 0;
i < rects.count();
++i )
{
xrects[ i ].x = rects[ i ].x();
xrects[ i ].y = rects[ i ].y();
xrects[ i ].width = rects[ i ].width();
xrects[ i ].height = rects[ i ].height();
}
XShapeCombineRectangles( display(), overlay, ShapeBounding, 0, 0,
xrects, rects.count(), ShapeSet, Unsorted );
delete[] xrects;
setOverlayShape( reg );
}
//****************************************