Fix shutdown dialog fading when compositing is enabled

Add a bit of logging to kompmgr
Fix a broken signal/slot disconnect in kwin


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1251223 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

ksmserver/shutdowndlg.cpp

@@ -129,9 +129,19 @@ void KSMShutdownFeedback::slotPaintEffect()
 		if ( m_greyImageCreated == false )
 		{
 			m_greyImageCreated = true;
-			setBackgroundMode( TQWidget::NoBackground );
+
+			// eliminate nasty flicker on first show
+			m_root.resize( width(), height() );
+			TQImage blendedImage = m_grayImage;
+			TQPainter p;
+                        p.begin( &m_root );
+                        blendedImage.setAlphaBuffer(false);
+                        p.drawImage( 0, 0, blendedImage );
+                        p.end();
+
+			setBackgroundPixmap( m_root );
 			setGeometry( TQApplication::desktop()->geometry() );
-			m_root.resize( width(), height() ); // for the default logout
+			setBackgroundMode( TQWidget::NoBackground );
 
 			m_unfadedImage = m_grayImage.copy();
 
@@ -233,6 +243,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 		if ( m_greyImageCreated == false )
 		{
 			m_greyImageCreated = true;
+
 			setBackgroundMode( TQWidget::NoBackground );
 			setGeometry( TQApplication::desktop()->geometry() );
 			m_root.resize( width(), height() ); // for the default logout
@@ -365,9 +376,19 @@ void KSMShutdownFeedback::slotPaintEffect()
 		if ( m_greyImageCreated == false )
 		{
 			m_greyImageCreated = true;
-			setBackgroundMode( TQWidget::NoBackground );
+
+			// eliminate nasty flicker on first show
+			m_root.resize( width(), height() );
+			TQImage blendedImage = m_grayImage;
+			TQPainter p;
+			p.begin( &m_root );
+			blendedImage.setAlphaBuffer(false);
+			p.drawImage( 0, 0, blendedImage );
+			p.end();
+
+			setBackgroundPixmap( m_root );
 			setGeometry( TQApplication::desktop()->geometry() );
-			m_root.resize( width(), height() ); // for the default logout
+			setBackgroundMode( TQWidget::NoBackground );
 
 			m_unfadedImage = m_grayImage.copy();
 

kwin/kompmgr/kompmgr.c

@@ -385,6 +385,7 @@ void delete_pid_file()
 
 #if WORK_AROUND_FGLRX
     if (my_exit_code == 3) {
+        printf("kompmgr lost connection to X server, restarting...\n\r"); fflush(stdout);
         sleep(1);
         char me[2048];
         readlink("/proc/self/exe", me, sizeof(me));

kwin/workspace.cpp

@@ -2739,7 +2739,7 @@ void Workspace::stopKompmgr()
     }
     delete kompmgr_selection;
     kompmgr_selection = NULL;
-    kompmgr->disconnect(this, TQT_SLOT(restartKompmgr()));
+    kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(KProcess*)));
     options->useTranslucency = FALSE;
     if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
     kompmgr->kill();