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

Fix last commit.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=827111
This commit is contained in:
Luboš Luňák 2008-07-02 10:11:16 +00:00
parent 075dda2993
commit 5d0f9b66dd
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
composite.cpp
View file

@ -478,24 +478,19 @@ Pixmap Toplevel::createWindowPixmap()
assert( compositing());
grabXServer();
KXErrorHandler err;
Pixmap pix = XCompositeNameWindowPixmap( display(), frameId());
window_pix = XCompositeNameWindowPixmap( display(), frameId());
// check that the received pixmap is valid and actually matches what we
// know about the window (i.e. size)
XWindowAttributes attrs;
if( !XGetWindowAttributes( display(), frameId(), &attrs ))
window_pix = None;
if( err.error( false ))
window_pix = None;
if( attrs.width != width() || attrs.height != height() || attrs.map_state != IsViewable )
window_pix = None;
ungrabXServer();
if( window_pix == None || pix == None )
if( !XGetWindowAttributes( display(), frameId(), &attrs )
|| err.error( false )
|| attrs.width != width() || attrs.height != height() || attrs.map_state != IsViewable )
{
kDebug( 1212 ) << "Creating window pixmap failed: " << this;
if( pix != None )
XFreePixmap( display(), pix );
XFreePixmap( display(), window_pix );
window_pix = None;
}
window_pix = pix;
ungrabXServer();
return window_pix;
#else
return None;