summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-13 16:14:24 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-13 16:14:24 -0500
commitc5ad26a7cc7129f39b4929fc9582ed44b0242a57 (patch)
treef86a008271c015469d78ba54d4bfbbbefc48adc1 /kdesktop
parente9efe389b4b528c4ac56fdde372f9d5128a536a3 (diff)
downloadtdebase-c5ad26a7cc7129f39b4929fc9582ed44b0242a57.tar.gz
tdebase-c5ad26a7cc7129f39b4929fc9582ed44b0242a57.zip
Fix kdesktop_lock screensaver engaging in corner case
This resolves Bug 906
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/lock/lockprocess.cc85
1 files changed, 66 insertions, 19 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index f33040b85..c6935c9b5 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -351,7 +351,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
mlockDateTime = TQDateTime::currentDateTime();
mHackDelayStartupTimeout = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::timeout()*1000:10*1000;
- mHackStartupEnabled = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::screenSaverEnabled():true;
+ mHackStartupEnabled = trinity_desktop_lock_use_system_modal_dialogs?KDesktopSettings::screenSaverEnabled():true;
configure();
}
@@ -705,7 +705,17 @@ void LockProcess::startSecureDialog()
if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
}
else {
- startHack();
+ if (mHackStartupEnabled == true) {
+ startHack();
+ }
+ else {
+ if (trinity_desktop_lock_use_system_modal_dialogs == true) {
+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+ }
+ else {
+ startHack();
+ }
+ }
}
return;
}
@@ -790,8 +800,13 @@ void LockProcess::configure()
if (mPriority > 19) mPriority = 19;
mSaver = KDesktopSettings::saver();
- if (mSaver.isEmpty() || mUseBlankOnly)
+ if (mSaver.isEmpty() || mUseBlankOnly) {
mSaver = "KBlankscreen.desktop";
+ }
+ if (KDesktopSettings::screenSaverEnabled() == false) {
+ mSaver = "";
+ mSaverExec = "";
+ }
readSaver();
@@ -984,7 +999,17 @@ void LockProcess::doDesktopResizeFinish()
if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
}
else {
- startHack();
+ if (mHackStartupEnabled == true) {
+ startHack();
+ }
+ else {
+ if (trinity_desktop_lock_use_system_modal_dialogs == true) {
+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+ }
+ else {
+ startHack();
+ }
+ }
}
mBusy = false;
@@ -1221,11 +1246,13 @@ bool LockProcess::startSaver()
raise();
XSync(tqt_xdisplay(), False);
setVRoot( winId(), winId() );
- if ((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!trinity_desktop_lock_in_sec_dlg)) {
- if (backingPixmap.isNull())
+ if (((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!trinity_desktop_lock_in_sec_dlg)) && mHackStartupEnabled) {
+ if (backingPixmap.isNull()) {
setBackgroundColor(black);
- else
+ }
+ else {
setBackgroundPixmap(backingPixmap);
+ }
setGeometry(0, 0, mRootWidth, mRootHeight);
erase();
}
@@ -1247,7 +1274,17 @@ bool LockProcess::startSaver()
if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
}
else {
- startHack();
+ if (mHackStartupEnabled == true) {
+ startHack();
+ }
+ else {
+ if (trinity_desktop_lock_use_system_modal_dialogs == true) {
+ ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
+ }
+ else {
+ startHack();
+ }
+ }
}
}
return true;
@@ -1387,10 +1424,12 @@ bool LockProcess::startHack()
if (currentDialog || (!mDialogs.isEmpty()))
{
// no resuming with dialog visible or when not visible
- if (backingPixmap.isNull())
+ if (backingPixmap.isNull()) {
setBackgroundColor(black);
- else
+ }
+ else {
setBackgroundPixmap(backingPixmap);
+ }
setGeometry(0, 0, mRootWidth, mRootHeight);
erase();
return false;
@@ -1434,10 +1473,12 @@ bool LockProcess::startHack()
if (trinity_desktop_lock_use_system_modal_dialogs) {
// Make sure we have a nice clean display to start with!
- if (backingPixmap.isNull())
+ if (backingPixmap.isNull()) {
setBackgroundColor(black);
- else
+ }
+ else {
setBackgroundPixmap(backingPixmap);
+ }
setGeometry(0, 0, mRootWidth, mRootHeight);
erase();
mSuspended = false;
@@ -1467,10 +1508,12 @@ bool LockProcess::startHack()
usleep(100);
TQApplication::syncX();
if (!trinity_desktop_lock_use_system_modal_dialogs) {
- if (backingPixmap.isNull())
+ if (backingPixmap.isNull()) {
setBackgroundColor(black);
- else
+ }
+ else {
setBackgroundPixmap(backingPixmap);
+ }
}
if (backingPixmap.isNull()) {
setGeometry(0, 0, mRootWidth, mRootHeight);
@@ -1513,10 +1556,12 @@ void LockProcess::hackExited(KProcess *)
usleep(100);
TQApplication::syncX();
if (!trinity_desktop_lock_use_system_modal_dialogs) {
- if (backingPixmap.isNull())
+ if (backingPixmap.isNull()) {
setBackgroundColor(black);
- else
+ }
+ else {
setBackgroundPixmap(backingPixmap);
+ }
}
if (backingPixmap.isNull()) {
setGeometry(0, 0, mRootWidth, mRootHeight);
@@ -1598,10 +1643,12 @@ void LockProcess::resume( bool force )
}
if( !force && (!mDialogs.isEmpty() || !mVisibility )) {
// no resuming with dialog visible or when not visible
- if (backingPixmap.isNull())
+ if (backingPixmap.isNull()) {
setBackgroundColor(black);
- else
+ }
+ else {
setBackgroundPixmap(backingPixmap);
+ }
setGeometry(0, 0, mRootWidth, mRootHeight);
erase();
return;
@@ -1797,7 +1844,7 @@ void LockProcess::slotPaintBackground(const TQPixmap &rpm)
}
backingPixmap = pm;
- if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
+ if ((trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) || (!mHackStartupEnabled)) {
setBackgroundPixmap(backingPixmap);
setGeometry(0, 0, mRootWidth, mRootHeight);
erase();