diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-26 14:44:25 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:14 +0200 |
| commit | 6db29f067a886035aa5f1c3d59c28b2917d3038d (patch) | |
| tree | 094d8fac77cf136894737a6c8d3c0b23b54834ca /kdesktop/lock/lockprocess.cc | |
| parent | 806153dfd6948a44d5a61e8c3fb6b6c21c00fe4a (diff) | |
| download | tdebase-6db29f067a886035aa5f1c3d59c28b2917d3038d.tar.gz tdebase-6db29f067a886035aa5f1c3d59c28b2917d3038d.zip | |
Fix a number of minor flaws in the lock dialog system
If SAK usage is enabled, override KDM theme
(cherry picked from commit e92e82b761f92754db582b5e98c0b3e788eba7d9)
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 327012abc..2e189dbfe 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -156,12 +156,10 @@ trinity_desktop_lock_autohide_lockdlg = TRUE; // Screen saver handling process. Handles screensaver window, // starting screensaver hacks, and password entry. // -LockProcess::LockProcess(bool child, bool useBlankOnly) +LockProcess::LockProcess() : TQWidget(0L, "saver window", (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)(WStyle_StaysOnTop|WStyle_Customize|WStyle_NoBorder)):((WFlags)WX11BypassWM))), mOpenGLVisual(0), - child_saver(child), mParent(0), - mUseBlankOnly(useBlankOnly), mShowLockDateTime(false), mSuspended(false), mVisibility(false), @@ -200,9 +198,6 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) setupSignals(); setupPipe(); - mShowLockDateTime = KDesktopSettings::showLockDateTime(); - mlockDateTime = TQDateTime::currentDateTime(); - kapp->installX11EventFilter(this); mForceContinualLockDisplayTimer = new TQTimer( this ); @@ -216,8 +211,11 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *))); - mHackDelayStartupTimeout = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::timeout()*1000:10*1000; - mHackStartupEnabled = trinity_desktop_lock_delay_screensaver_start?KDesktopSettings::screenSaverEnabled():true; + // Try to get the root pixmap + if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this); + m_rootPixmap->setCustomPainting(true); + connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &))); + m_rootPixmap->start(); // Get root window size XWindowAttributes rootAttr; @@ -341,6 +339,23 @@ LockProcess::~LockProcess() mPipeOpen_out = false; } +//--------------------------------------------------------------------------- +// +// Initialization for startup +// This is where instance settings should be set--all objects should have already been created in the constructor above +// +void LockProcess::init(bool child, bool useBlankOnly) +{ + child_saver = child; + mUseBlankOnly = useBlankOnly; + + mShowLockDateTime = KDesktopSettings::showLockDateTime(); + 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; +} + static int signal_pipe[2]; static void sigterm_handler(int) |