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

Fix wrong formatting and the errors resulting from it.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=723786
This commit is contained in:
Luboš Luňák 2007-10-10 18:15:19 +00:00
parent f80c129100
commit 5007596741
1 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
sm.cpp
View file

@ -205,45 +205,54 @@ SessionInfo* Workspace::takeSessionInfo( Client* c )
// First search ``session''
if (! sessionId.isEmpty() )
{
// look for a real session managed client (algorithm suggested by ICCCM)
foreach( SessionInfo* info, session ) {
if ( realInfo )
break;
if ( info->sessionId == sessionId && sessionInfoWindowTypeMatch( c, info ))
{
if ( ! windowRole.isEmpty() )
{
if ( info->windowRole == windowRole )
realInfo = info;
session.removeAll(info);
}
else
{
if ( info->windowRole.isEmpty() &&
info->resourceName == resourceName &&
info->resourceClass == resourceClass )
realInfo = info;
session.removeAll(info);
}
}
}
// look for a real session managed client (algorithm suggested by ICCCM)
foreach( SessionInfo* info, session )
{
if( realInfo )
break;
if( info->sessionId == sessionId && sessionInfoWindowTypeMatch( c, info ))
{
if( ! windowRole.isEmpty() )
{
if( info->windowRole == windowRole )
{
realInfo = info;
session.removeAll(info);
}
}
else
{
if( info->windowRole.isEmpty()
&& info->resourceName == resourceName
&& info->resourceClass == resourceClass )
{
realInfo = info;
session.removeAll(info);
}
}
}
}
}
else
{
// look for a sessioninfo with matching features.
foreach( SessionInfo* info, session ) {
if ( realInfo ) break;
if ( info->resourceName == resourceName &&
info->resourceClass == resourceClass &&
info->wmClientMachine == wmClientMachine &&
sessionInfoWindowTypeMatch( c, info ))
if ( wmCommand.isEmpty() || info->wmCommand == wmCommand ) {
realInfo = info;
session.removeAll( info );
}
}
// look for a sessioninfo with matching features.
foreach( SessionInfo* info, session )
{
if( realInfo )
break;
if( info->resourceName == resourceName
&& info->resourceClass == resourceClass
&& info->wmClientMachine == wmClientMachine
&& sessionInfoWindowTypeMatch( c, info ))
{
if ( wmCommand.isEmpty() || info->wmCommand == wmCommand )
{
realInfo = info;
session.removeAll( info );
}
}
}
}
return realInfo;
}