Make kdesktop_lock and ksmserver ARGB screen blanking more efficient and improve multi-head support in same

Fix kdesktop_lock busy cursor appearing over active screen saver after GUI-driven VT switch and delayed return to original VT
Repair kdesktop_lock invalid password delay bypass with Cancel button

1 files changed, 5 insertions, 5 deletions

diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index d4881ad85..5c50602cb 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -543,17 +543,17 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
 		system("krootbacking &");
 	}
 
+	m_screenGeometry = TQApplication::desktop()->geometry();
+
 	// eliminate nasty flicker on first show
-	m_root.resize( kapp->desktop()->width(), kapp->desktop()->height() );
-	TQImage blendedImage = TQImage( kapp->desktop()->width(), kapp->desktop()->height(), 32 );
+	m_root.resize(m_screenGeometry.width(), m_screenGeometry.height());
 	TQPainter p;
 	p.begin( &m_root );
-	blendedImage.setAlphaBuffer(false);
-	p.drawImage( 0, 0, blendedImage );
+	p.fillRect( 0, 0, m_root.width(), m_root.height(), TQBrush(tqRgba(0, 0, 0, 0)) );
 	p.end();
 
 	setBackgroundPixmap( m_root );
-	setGeometry( TQApplication::desktop()->geometry() );
+	setGeometry( m_screenGeometry );
 	setBackgroundMode( TQWidget::NoBackground );
 }