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

Reshuffle compositing init a bit, and make KWIN_COMPOSE work even

Browse source 
if compositing is turned off in options.


svn path=/trunk/KDE/kdebase/workspace/; revision=772299
This commit is contained in:
Luboš Luňák 2008-02-08 10:31:40 +00:00
parent 0c6082dbcf
commit 2fb2f76168
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
composite.cpp
View file

@ -77,7 +77,9 @@ namespace KWin
void Workspace::setupCompositing()
{
#ifdef KWIN_HAVE_COMPOSITING
if( !options->useCompositing )
if( scene != NULL )
return;
if( !options->useCompositing && getenv( "KWIN_COMPOSE") == NULL )
{
kDebug( 1212 ) << "Compositing is turned off in options";
return;
@ -87,14 +89,6 @@ void Workspace::setupCompositing()
kError( 1212 ) << "Compositing is not possible";
return;
}
if( scene != NULL )
return;
char selection_name[ 100 ];
sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( display()));
cm_selection = new KSelectionOwner( selection_name );
connect( cm_selection, SIGNAL( lostOwnership()), SLOT( lostCMSelection()));
cm_selection->claim( true ); // force claiming
CompositingType type = options->compositingMode;
if( getenv( "KWIN_COMPOSE" ))
{
@ -109,11 +103,16 @@ void Workspace::setupCompositing()
break;
default:
kDebug( 1212 ) << "No compositing";
delete cm_selection;
return;
}
}
char selection_name[ 100 ];
sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( display()));
cm_selection = new KSelectionOwner( selection_name );
connect( cm_selection, SIGNAL( lostOwnership()), SLOT( lostCMSelection()));
cm_selection->claim( true ); // force claiming
switch( type )
{
/*case 'B':