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

Various optimizations and memory leak patches to box and cover switch.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=936613
This commit is contained in:
Lucas Murray 2009-03-08 05:07:32 +00:00
parent 312b762c80
commit 358264a828
4 changed files with 64 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
effects/boxswitch/boxswitch.cpp
View file

@ -79,7 +79,7 @@ void BoxSwitchEffect::reconfigure( ReconfigureFlags )
void BoxSwitchEffect::prePaintWindow( EffectWindow* w, WindowPrePaintData& data, int time )
{
if( mActivated )
if( activeTimeLine.value() != 0.0 )
{
if( mMode == TabBoxWindowsMode )
{
@ -109,7 +109,14 @@ void BoxSwitchEffect::prePaintScreen( ScreenPrePaintData& data, int time )
if( mActivated )
activeTimeLine.addTime( time );
else
{
activeTimeLine.removeTime( time );
if( activeTimeLine.value() == 0.0 )
{ // No longer need the window data
qDeleteAll( windows );
windows.clear();
}
}
if( mActivated && animation )
{
timeLine.addTime( time );
@ -428,7 +435,7 @@ void BoxSwitchEffect::setActive()
{
mActivated = true;
// Do this here so we have correct fading on deactivation
// Just in case we are activated again before the deactivation animation finished
qDeleteAll( windows );
windows.clear();
@ -561,6 +568,7 @@ void BoxSwitchEffect::calculateItemSizes()
{
if( mMode == TabBoxWindowsMode )
{
qDeleteAll( windows );
windows.clear();
if( mAnimateSwitch )
{
@ -637,6 +645,10 @@ void BoxSwitchEffect::calculateItemSizes()
EffectWindow* w = ordered_windows.at( i );
windows[ w ] = new ItemInfo();
windows[ w ]->iconFrame = new EffectFrame( EffectFrame::Unstyled, false );
windows[ w ]->iconFrame->setAlignment( Qt::AlignTop | Qt::AlignLeft );
windows[ w ]->iconFrame->setIcon( w->icon() );
float moveIndex = i;
if( animation && timeLine.value() < 0.5 )
{
@ -669,6 +681,10 @@ void BoxSwitchEffect::calculateItemSizes()
EffectWindow* w = original_windows.at( i );
windows[ w ] = new ItemInfo();
windows[ w ]->iconFrame = new EffectFrame( EffectFrame::Unstyled, false );
windows[ w ]->iconFrame->setAlignment( Qt::AlignTop | Qt::AlignLeft );
windows[ w ]->iconFrame->setIcon( w->icon() );
windows[ w ]->area = QRect( frame_area.x() + i * item_max_size.width(),
frame_area.y(),
item_max_size.width(), item_max_size.height());
@ -938,34 +954,8 @@ void BoxSwitchEffect::paintWindowIcon( EffectWindow* w )
return;
}
if( windows[ w ]->icon.cacheKey() != w->icon().cacheKey())
{ // make sure windows[ w ]->icon is the right QPixmap, and rebind
windows[ w ]->icon = w->icon();
if( ( windows.size() % 2 == 1 ) && animation && w == edge_window )
{
int alpha;
if( timeLine.value() < 0.5 )
alpha = 255.0f * (1.0 - timeLine.value()*2.0);
else
alpha = 255.0f * (timeLine.value()*2.0 - 1.0);
QPixmap transparency = windows[ w ]->icon.copy( windows[ w ]->icon.rect() );
transparency.fill( QColor( 255, 255, 255, alpha ) );
windows[ w ]->icon.setAlphaChannel( transparency.alphaChannel() );
}
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
if( effects->compositingType() == OpenGLCompositing )
{
windows[ w ]->iconTexture.load( windows[ w ]->icon );
windows[ w ]->iconTexture.setFilter( GL_LINEAR );
}
#endif
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
if( effects->compositingType() == XRenderCompositing )
windows[ w ]->iconPicture = XRenderPicture( windows[ w ]->icon );
#endif
}
int width = windows[ w ]->icon.width();
int height = windows[ w ]->icon.height();
int width = w->icon().width();
int height = w->icon().height();
int x = windows[ w ]->area.x() + windows[ w ]->area.width() - width - highlight_margin;
int y = windows[ w ]->area.y() + windows[ w ]->area.height() - height - highlight_margin;
if( ( windows.size() % 2 == 0 ) )
@ -1020,41 +1010,19 @@ void BoxSwitchEffect::paintWindowIcon( EffectWindow* w )
}
}
}
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
if( effects->compositingType() == OpenGLCompositing )
{
glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT );
glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
// Render some background
float alpha = 0.5;
if( ( windows.size() % 2 == 1 ) && animation && w == edge_window )
{
if( timeLine.value() < 0.5 )
alpha *= (1.0 - timeLine.value()*2.0);
else
alpha *= (timeLine.value()*2.0 - 1.0);
}
glColor4f( 0, 0, 0, alpha );
renderRoundBox( QRect( x-3, y-3, width+6, height+6 ), 3 );
// Render the icon
glColor4f( 1, 1, 1, 1 );
windows[ w ]->iconTexture.bind();
windows[ w ]->iconTexture.render( infiniteRegion(), QRect( x, y, width, height ));
windows[ w ]->iconTexture.unbind();
glPopAttrib();
}
#endif
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
if( effects->compositingType() == XRenderCompositing )
{
XRenderComposite( display(),
windows[ w ]->icon.depth() == 32 ? PictOpOver : PictOpSrc,
windows[ w ]->iconPicture, None,
effects->xrenderBufferPicture(),
0, 0, 0, 0, x, y, width, height );
}
#endif
windows[ w ]->iconFrame->setPosition( QPoint( x, y ));
windows[ w ]->iconFrame->render( infiniteRegion(), 1.0, 0.75 );
}
BoxSwitchEffect::ItemInfo::ItemInfo()
: iconFrame( NULL )
{
}
BoxSwitchEffect::ItemInfo::~ItemInfo()
{
delete iconFrame;
}
} // namespace

10
effects/boxswitch/boxswitch.h
View file

@ -117,16 +117,12 @@ class BoxSwitchEffect
class BoxSwitchEffect::ItemInfo
{
public:
ItemInfo();
~ItemInfo();
QRect area; // maximal painting area, including any frames/highlights/etc.
QRegion clickable;
QRect thumbnail;
QPixmap icon;
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
GLTexture iconTexture;
#endif
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
XRenderPicture iconPicture;
#endif
EffectFrame* iconFrame;
};
} // namespace

76
effects/coverswitch/coverswitch.cpp
View file

@ -65,6 +65,7 @@ CoverSwitchEffect::CoverSwitchEffect()
CoverSwitchEffect::~CoverSwitchEffect()
{
qDeleteAll( windows );
}
bool CoverSwitchEffect::supported()
@ -320,18 +321,6 @@ void CoverSwitchEffect::paintScreen( int mask, QRegion region, ScreenPaintData&
opacity = timeLine.value();
else if( stop )
opacity = 1.0 - timeLine.value();
QPixmap iconPixmap = effects->currentTabBoxWindow()->icon();
if( start || stop )
{
int alpha = 255.0f * timeLine.value();
if( stop )
alpha = 255.0f - alpha;
QPixmap transparency = iconPixmap.copy( iconPixmap.rect() );
transparency.fill( QColor( 255, 255, 255, alpha ));
iconPixmap.setAlphaChannel( transparency.alphaChannel() );
}
captionFrame.setText( effects->currentTabBoxWindow()->caption() );
captionFrame.setIcon( iconPixmap );
captionFrame.render( region, opacity );
if( ( thumbnails && (!dynamicThumbnails ||
@ -551,6 +540,9 @@ void CoverSwitchEffect::tabBoxAdded( int mode )
QFontMetrics( captionFont ).height() );
captionFrame.setGeometry( frameRect );
captionFrame.setIconSize( QSize( frameRect.height(), frameRect.height() ));
// And initial contents
captionFrame.setText( selected_window->caption() );
captionFrame.setIcon( selected_window->icon() );
effects->addRepaintFull();
}
@ -659,6 +651,8 @@ void CoverSwitchEffect::tabBoxUpdated()
}
}
selected_window = effects->currentTabBoxWindow();
captionFrame.setText( selected_window->caption() );
captionFrame.setIcon( selected_window->icon() );
}
}
if( thumbnails && (!dynamicThumbnails ||
@ -970,6 +964,7 @@ void CoverSwitchEffect::calculateFrameSize()
void CoverSwitchEffect::calculateItemSizes()
{
qDeleteAll( windows );
windows.clear();
EffectWindowList original_windows = effects->currentTabBoxWindowList();
int index = original_windows.indexOf( effects->currentTabBoxWindow() );
@ -1045,6 +1040,10 @@ void CoverSwitchEffect::calculateItemSizes()
EffectWindow* w = ordered_windows.at( i );
windows[ w ] = new ItemInfo();
windows[ w ]->iconFrame = new EffectFrame( EffectFrame::Unstyled, false );
windows[ w ]->iconFrame->setAlignment( Qt::AlignTop | Qt::AlignLeft );
windows[ w ]->iconFrame->setIcon( w->icon() );
float moveIndex = i;
if( animation && timeLine.value() < 0.5 )
{
@ -1267,25 +1266,8 @@ void CoverSwitchEffect::paintWindowIcon( EffectWindow* w )
return;
}
if( windows[ w ]->icon.cacheKey() != w->icon().cacheKey())
{ // make sure windows[ w ]->icon is the right QPixmap, and rebind
windows[ w ]->icon = w->icon();
if( ( windows.size() % 2 == 1 ) && animation && w == edge_window )
{
int alpha;
if( timeLine.value() < 0.5 )
alpha = 255.0f * (1.0 - timeLine.value()*2.0);
else
alpha = 255.0f * (timeLine.value()*2.0 - 1.0);
QPixmap transparency = windows[ w ]->icon.copy( windows[ w ]->icon.rect() );
transparency.fill( QColor( 255, 255, 255, alpha ) );
windows[ w ]->icon.setAlphaChannel( transparency.alphaChannel() );
}
windows[ w ]->iconTexture.load( windows[ w ]->icon );
windows[ w ]->iconTexture.setFilter( GL_LINEAR );
}
int width = windows[ w ]->icon.width();
int height = windows[ w ]->icon.height();
int width = w->icon().width();
int height = w->icon().height();
int x = windows[ w ]->area.x() + windows[ w ]->area.width() - width - highlight_margin;
int y = windows[ w ]->area.y() + windows[ w ]->area.height() - height - highlight_margin;
if( ( windows.size() % 2 == 0 ) )
@ -1340,26 +1322,9 @@ void CoverSwitchEffect::paintWindowIcon( EffectWindow* w )
}
}
}
glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT );
glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
// Render some background
float alpha = 0.5;
if( ( windows.size() % 2 == 1 ) && animation && w == edge_window )
{
if( timeLine.value() < 0.5 )
alpha *= (1.0 - timeLine.value()*2.0);
else
alpha *= (timeLine.value()*2.0 - 1.0);
}
glColor4f( 0, 0, 0, alpha );
renderRoundBox( QRect( x-3, y-3, width+6, height+6 ), 3 );
// Render the icon
glColor4f( 1, 1, 1, 1 );
windows[ w ]->iconTexture.bind();
windows[ w ]->iconTexture.render( infiniteRegion(), QRect( x, y, width, height ));
windows[ w ]->iconTexture.unbind();
glPopAttrib();
windows[ w ]->iconFrame->setPosition( QPoint( x, y ));
windows[ w ]->iconFrame->render( infiniteRegion(), 1.0, 0.75 );
}
void CoverSwitchEffect::windowInputMouseEvent( Window w, QEvent* e )
@ -1461,5 +1426,14 @@ void CoverSwitchEffect::abort()
thumbnailFrame.free();
}
CoverSwitchEffect::ItemInfo::ItemInfo()
: iconFrame( NULL )
{
}
CoverSwitchEffect::ItemInfo::~ItemInfo()
{
delete iconFrame;
}
} // namespace

5
effects/coverswitch/coverswitch.h
View file

@ -123,11 +123,12 @@ class CoverSwitchEffect
class CoverSwitchEffect::ItemInfo
{
public:
ItemInfo();
~ItemInfo();
QRect area; // maximal painting area, including any frames/highlights/etc.
QRegion clickable;
QRect thumbnail;
QPixmap icon;
GLTexture iconTexture;
EffectFrame* iconFrame;
};
} // namespace