summaryrefslogtreecommitdiffstats
path: root/kdesktop/lockeng.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2015-04-13 00:48:27 -0500
committerSlávek Banko <[email protected]>2015-04-14 02:27:28 +0200
commit2b0e13211cc2ce86926cfe133ce29df3a6141e91 (patch)
tree3dfcf227e926b9637e76d178914447d4e386d722 /kdesktop/lockeng.h
parent7188f7044b0bb11a24754cfa83d39ecc0721bbdb (diff)
downloadtdebase-2b0e13211cc2ce86926cfe133ce29df3a6141e91.tar.gz
tdebase-2b0e13211cc2ce86926cfe133ce29df3a6141e91.zip
Ensure desktop is completely hidden before sending fullyOnline()
Do not block kdesktop process while waiting for kdesktop_lock to engage prior to VT switch/new VT requests made from within kdesktop (cherry picked from commit 78d33c29157b8e3a0b81c36f73ec5f958439565c)
Diffstat (limited to 'kdesktop/lockeng.h')
-rw-r--r--kdesktop/lockeng.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index 9827090b4..166d6b40e 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -106,6 +106,16 @@ public:
*/
bool waitForLockEngage();
+ /**
+ * @internal
+ */
+ void lockScreenAndDoNewSession();
+
+ /**
+ * @internal
+ */
+ void lockScreenAndSwitchSession(int vt);
+
signals:
void terminateHelperThread();
void asyncLock();
@@ -175,6 +185,8 @@ private:
TDEProcess* mSAKProcess;
bool mTerminationRequested;
bool mSaverProcessReady;
+ bool mNewVTAfterLockEngage;
+ int mSwitchVTAfterLockEngage;
struct sigaction mSignalAction;
TQT_DBusConnection dBusConn;
TQT_DBusProxy* dBusLocal;