When unmapping, unmap from outside(frame->wrapper->window), this prevents

frame from getting EnterNotify after unmapping the window.

svn path=/trunk/kdebase/kwin/; revision=270953
This commit is contained in:
Luboš Luňák 2003-12-03 12:24:56 +00:00
parent 2e1bd0e762
commit 1a852fe8dc

View file

@ -703,8 +703,8 @@ void Client::setShade( ShadeMode mode )
shade_geometry_change = true; shade_geometry_change = true;
QSize s( sizeForClientSize( QSize( clientSize().width(), 0), SizemodeShaded ) ); QSize s( sizeForClientSize( QSize( clientSize().width(), 0), SizemodeShaded ) );
XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify
XUnmapWindow( qt_xdisplay(), client );
XUnmapWindow( qt_xdisplay(), wrapper ); XUnmapWindow( qt_xdisplay(), wrapper );
XUnmapWindow( qt_xdisplay(), client );
XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
// FRAME repaint( FALSE ); // FRAME repaint( FALSE );
// bool wasStaticContents = testWFlags( WStaticContents ); // bool wasStaticContents = testWFlags( WStaticContents );
@ -857,9 +857,9 @@ void Client::rawHide()
// will be missed is also very minimal, so I don't think it's needed to grab the server // will be missed is also very minimal, so I don't think it's needed to grab the server
// here. // here.
XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify
XUnmapWindow( qt_xdisplay(), client );
XUnmapWindow( qt_xdisplay(), wrapper );
XUnmapWindow( qt_xdisplay(), frame ); XUnmapWindow( qt_xdisplay(), frame );
XUnmapWindow( qt_xdisplay(), wrapper );
XUnmapWindow( qt_xdisplay(), client );
XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
if( decoration != NULL ) if( decoration != NULL )
decoration->widget()->hide(); // not really necessary, but let it know the state decoration->widget()->hide(); // not really necessary, but let it know the state