summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-23 15:50:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-23 15:50:32 -0600
commit68cba853735b2d8a266367f47fe11040966ce85c (patch)
tree7de98b4aac3cd664e8b10dc80ad35510e51f143c /kdesktop
parent3126f2cf71e835c1aac0dde6d878637a5a2b216d (diff)
downloadtdebase-68cba853735b2d8a266367f47fe11040966ce85c.tar.gz
tdebase-68cba853735b2d8a266367f47fe11040966ce85c.zip
Fix twin deleting comptontdepidfile when compton-tde already running on startup
Fix long-standing bug in calling desktop lock methods over DCOP from within kdesktop process
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/krootwm.cc62
-rw-r--r--kdesktop/krootwm.h23
2 files changed, 78 insertions, 7 deletions
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index e200366f7..677c81f65 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -52,6 +52,8 @@
#include <tdemessagebox.h>
#include <kuser.h>
#include <tqfile.h>
+#include <ntqthread.h>
+#include <tqeventloop.h>
#include "krootwm.h"
#include "kdiconview.h"
@@ -71,6 +73,15 @@ extern TQCString kdesktop_name, kicker_name, twin_name;
KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
{
+ m_helperThread = new TQEventLoopThread;
+ m_helperThread->start();
+ m_threadHelperObject = new KRootWmThreadHelperObject;
+ m_threadHelperObject->moveToThread(m_helperThread);
+ connect(this, TQT_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQT_SLOT(terminateThread()));
+ connect(this, TQT_SIGNAL(asyncLock()), m_threadHelperObject, TQT_SLOT(slotLock()));
+ connect(this, TQT_SIGNAL(asyncLockAndDoNewSession()), m_threadHelperObject, TQT_SLOT(lockAndDoNewSession()));
+ connect(this, TQT_SIGNAL(asyncSlotSessionActivated(int)), m_threadHelperObject, TQT_SLOT(slotSessionActivated(int)));
+
s_rootWm = this;
m_actionCollection = new TDEActionCollection(_desktop, this, "KRootWm::m_actionCollection");
m_pDesktop = _desktop;
@@ -213,6 +224,11 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
KRootWm::~KRootWm()
{
+ terminateHelperThread();
+ m_helperThread->wait();
+ delete m_threadHelperObject;
+ delete m_helperThread;
+
delete m_actionCollection;
delete desktopMenu;
delete windowListMenu;
@@ -820,7 +836,7 @@ void KRootWm::slotCascadeWindows() {
void KRootWm::slotLock() {
- kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "lock()", TQString(""));
+ asyncLock();
}
@@ -864,10 +880,40 @@ void KRootWm::slotPopulateSessions()
}
}
+void KRootWmThreadHelperObject::terminateThread() {
+ TQEventLoop* eventLoop = TQApplication::eventLoop();
+ if (eventLoop) {
+ eventLoop->exit(0);
+ }
+}
+
+void KRootWmThreadHelperObject::slotLock() {
+ // Block here until lock is complete
+ // If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages!
+ // Force remote call to ensure that blocking is enforced even though this call is being made from inside the kdesktop_name application...
+ // If this is not done DCOP will translate the call into a send and the desktop of the locked session will be shown after VT switch as above
+ system("dcop kdesktop KScreensaverIface lock");
+}
+
+void KRootWmThreadHelperObject::lockAndDoNewSession() {
+ // Block here until lock is complete
+ // If this is not done the desktop of the locked session will be shown after VT switch until the lock fully engages!
+ // Force remote call to ensure that blocking is enforced even though this call is being made from inside the kdesktop_name application...
+ // If this is not done DCOP will translate the call into a send and the desktop of the locked session will be shown after VT switch as above
+ if (system("dcop kdesktop KScreensaverIface lock") == 0) {
+ DM().startReserve();
+ }
+}
+
+void KRootWmThreadHelperObject::slotSessionActivated(int vt) {
+ DM().lockSwitchVT( vt );
+}
+
void KRootWm::slotSessionActivated( int ent )
{
- if (ent > 0 && !sessionsMenu->isItemChecked( ent ))
- DM().lockSwitchVT( ent );
+ if (ent > 0 && !sessionsMenu->isItemChecked( ent )) {
+ asyncSlotSessionActivated( ent );
+ }
}
void KRootWm::slotNewSession()
@@ -903,10 +949,12 @@ void KRootWm::doNewSession( bool lock )
if (result==KMessageBox::Cancel)
return;
- if (lock)
- slotLock();
-
- DM().startReserve();
+ if (lock) {
+ asyncLockAndDoNewSession();
+ }
+ else {
+ DM().startReserve();
+ }
}
void KRootWm::slotMenuItemActivated(int /* item */ )
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index dabe5ac23..eb6bd9f55 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -56,6 +56,9 @@ enum {
ITEM_LOGOUT
};
+class TQEventLoopThread;
+class KRootWmThreadHelperObject;
+
/**
* This class is the handler for the menus (root popup menu and desktop menubar)
*/
@@ -123,6 +126,12 @@ public slots:
void slotOpenTerminal();
void slotLockNNewSession();
+signals:
+ void terminateHelperThread();
+ void asyncLock();
+ void asyncLockAndDoNewSession();
+ void asyncSlotSessionActivated(int vt);
+
private:
KDesktop* m_pDesktop;
@@ -166,6 +175,9 @@ private:
static KRootWm * s_rootWm;
+ TQEventLoopThread* m_helperThread;
+ KRootWmThreadHelperObject* m_threadHelperObject;
+
private slots:
@@ -175,4 +187,15 @@ private slots:
void slotConfigClosed();
};
+class KRootWmThreadHelperObject : public TQObject
+{
+ TQ_OBJECT
+
+ public slots:
+ void terminateThread();
+ void slotLock();
+ void lockAndDoNewSession();
+ void slotSessionActivated(int vt);
+};
+
#endif