|
|
@ -263,8 +263,6 @@ LockProcess::LockProcess()
|
|
|
|
if ((*it).startsWith("method="))
|
|
|
|
if ((*it).startsWith("method="))
|
|
|
|
mMethod = (*it).mid(7);
|
|
|
|
mMethod = (*it).mid(7);
|
|
|
|
|
|
|
|
|
|
|
|
configure();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_DPMS
|
|
|
|
#ifdef HAVE_DPMS
|
|
|
|
if (mDPMSDepend) {
|
|
|
|
if (mDPMSDepend) {
|
|
|
|
BOOL on;
|
|
|
|
BOOL on;
|
|
|
@ -354,6 +352,8 @@ void LockProcess::init(bool child, bool useBlankOnly)
|
|
|
|
|
|
|
|
|
|
|
|
mHackDelayStartupTimeout = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::timeout()*1000:10*1000;
|
|
|
|
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_delay_screensaver_start?KDesktopSettings::screenSaverEnabled():true;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
configure();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int signal_pipe[2];
|
|
|
|
static int signal_pipe[2];
|
|
|
@ -689,6 +689,7 @@ void LockProcess::startSecureDialog()
|
|
|
|
// the screensaver kicks in because the user moved the mouse after
|
|
|
|
// the screensaver kicks in because the user moved the mouse after
|
|
|
|
// selecting "lock screen", that looks really untidy.
|
|
|
|
// selecting "lock screen", that looks really untidy.
|
|
|
|
mBusy = true;
|
|
|
|
mBusy = true;
|
|
|
|
|
|
|
|
trinity_desktop_lock_forced = true;
|
|
|
|
// Make sure the cursor is not showing busy status
|
|
|
|
// Make sure the cursor is not showing busy status
|
|
|
|
setCursor( tqarrowCursor );
|
|
|
|
setCursor( tqarrowCursor );
|
|
|
|
if (startLock())
|
|
|
|
if (startLock())
|
|
|
@ -699,10 +700,18 @@ void LockProcess::startSecureDialog()
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
|
|
|
|
TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
|
|
|
|
|
|
|
|
ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
|
|
|
|
|
|
|
|
if (mHackStartupEnabled) mHackDelayStartupTimer->start(mHackDelayStartupTimeout, TRUE);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
startHack();
|
|
|
|
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
stopSaver();
|
|
|
|
stopSaver();
|
|
|
|
mBusy = false;
|
|
|
|
mBusy = false;
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (ret == 2) {
|
|
|
|
if (ret == 2) {
|
|
|
|
trinity_desktop_lock_closing_windows = 1;
|
|
|
|
trinity_desktop_lock_closing_windows = 1;
|
|
|
@ -1212,7 +1221,7 @@ bool LockProcess::startSaver()
|
|
|
|
raise();
|
|
|
|
raise();
|
|
|
|
XSync(qt_xdisplay(), False);
|
|
|
|
XSync(qt_xdisplay(), False);
|
|
|
|
setVRoot( winId(), winId() );
|
|
|
|
setVRoot( winId(), winId() );
|
|
|
|
if (!(trinity_desktop_lock_delay_screensaver_start && (trinity_desktop_lock_forced || trinity_desktop_lock_in_sec_dlg))) {
|
|
|
|
if ((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!trinity_desktop_lock_in_sec_dlg)) {
|
|
|
|
if (backingPixmap.isNull())
|
|
|
|
if (backingPixmap.isNull())
|
|
|
|
setBackgroundColor(black);
|
|
|
|
setBackgroundColor(black);
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -1224,8 +1233,6 @@ bool LockProcess::startSaver()
|
|
|
|
// Try to get the root pixmap
|
|
|
|
// Try to get the root pixmap
|
|
|
|
if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
|
|
|
|
if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
|
|
|
|
m_rootPixmap->setCustomPainting(true);
|
|
|
|
m_rootPixmap->setCustomPainting(true);
|
|
|
|
connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &)));
|
|
|
|
|
|
|
|
m_rootPixmap->start();
|
|
|
|
|
|
|
|
// Sometimes KRootPixmap fails...make sure the desktop is hidden regardless
|
|
|
|
// Sometimes KRootPixmap fails...make sure the desktop is hidden regardless
|
|
|
|
if (!mEnsureScreenHiddenTimer) {
|
|
|
|
if (!mEnsureScreenHiddenTimer) {
|
|
|
|
mEnsureScreenHiddenTimer = new TQTimer( this );
|
|
|
|
mEnsureScreenHiddenTimer = new TQTimer( this );
|
|
|
|