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

Proper stacking order even for unmanaged windows.

Browse source 
svn path=/branches/work/kwin_composite/; revision=558427
This commit is contained in:
Luboš Luňák 2006-07-05 12:00:13 +00:00
parent dfe8968d8e
commit e76564c165
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
composite.cpp
View file

@ -55,15 +55,34 @@ void Workspace::compositeTimeout()
{ {
if( !damaged ) if( !damaged )
return; return;
ToplevelList windows;
Window* children;
unsigned int children_count;
Window dummy;
XQueryTree( display(), rootWindow(), &dummy, &dummy, &children, &children_count );
for( unsigned int i = 0;
i < children_count;
++i )
{
if( Client* c = findClient( FrameIdMatchPredicate( children[ i ] )))
windows.append( c );
else if( Unmanaged* c = findUnmanaged( HandleMatchPredicate( children[ i ] )))
windows.append( c );
}
XGCValues val; XGCValues val;
val.foreground = WhitePixel( display(), DefaultScreen( display())); val.foreground = WhitePixel( display(), DefaultScreen( display()));
val.subwindow_mode = IncludeInferiors; val.subwindow_mode = IncludeInferiors;
GC gc = XCreateGC( display(), composite_pixmap, GCForeground | GCSubwindowMode, &val ); GC gc = XCreateGC( display(), composite_pixmap, GCForeground | GCSubwindowMode, &val );
XFillRectangle( display(), composite_pixmap, gc, 0, 0, displayWidth(), displayHeight()); XFillRectangle( display(), composite_pixmap, gc, 0, 0, displayWidth(), displayHeight());
for( ClientList::ConstIterator it = stackingOrder().begin(); for( ToplevelList::ConstIterator it = windows.begin();
it != stackingOrder().end(); it != windows.end();
++it ) ++it )
{ {
if( Client* c = dynamic_cast< Client* >( *it ))
{
if( !c->isShown( true ) || !c->isOnCurrentDesktop())
continue;
}
#if 1 #if 1
(*it)->windowPixmap(); // trigger creation (*it)->windowPixmap(); // trigger creation
effects->paintWindow( *it ); effects->paintWindow( *it );
@ -76,20 +95,11 @@ void Workspace::compositeTimeout()
} }
#endif #endif
} }
for( UnmanagedList::ConstIterator it = unmanaged.begin();
it != unmanaged.end();
++it )
{
#if 1 #if 1
effects->paintWorkspace( this ); effects->paintWorkspace( this );
#else #else
QRect r = (*it)->geometry().intersect( QRect( 0, 0, displayWidth(), displayHeight()));
if( !r.isEmpty())
XCopyArea( display(), (*it)->windowPixmap(), composite_pixmap, gc,
qMax( 0, -(*it)->x()), qMax( 0, -(*it)->y()), r.width(), r.height(), r.x(), r.y());
#endif
}
XCopyArea( display(), composite_pixmap, rootWindow(), gc, 0, 0, displayWidth(), displayHeight(), 0, 0 ); XCopyArea( display(), composite_pixmap, rootWindow(), gc, 0, 0, displayWidth(), displayHeight(), 0, 0 );
#endif
XFreeGC( display(), gc ); XFreeGC( display(), gc );
XFlush( display()); XFlush( display());
damaged = false; damaged = false;