diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-16 18:32:17 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-16 18:32:17 +0900 |
commit | efdf0bbcd37d5aaa05649437b286aeecfd38c617 (patch) | |
tree | f056c88a705748c6b871fe4ba6f4e103bb37d822 /konsole/konsole/konsole.cpp | |
parent | 83708272fbd48b9a65342cc66af5c0a3837d7a13 (diff) | |
download | tdebase-efdf0bbcd37d5aaa05649437b286aeecfd38c617.tar.gz tdebase-efdf0bbcd37d5aaa05649437b286aeecfd38c617.zip |
Improved code for workaround for Qt/Tde/X? bug for handling Meta key as Alt key
in terminal emulation after restored sessions. This relates to bug 1026.
Diffstat (limited to 'konsole/konsole/konsole.cpp')
-rw-r--r-- | konsole/konsole/konsole.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 646edd96b..569110b08 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -2377,10 +2377,12 @@ void Konsole::disableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - disconnect(from->widget(),TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(),TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(),TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(),TQT_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2398,10 +2400,12 @@ void Konsole::enableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - connect(from->widget(),TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(),TQT_SLOT(onKeyPress(TQKeyEvent*))); - connect(from->widget(),TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(),TQT_SLOT(onKeyReleased(TQKeyEvent*))); + connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); + connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); + connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -3748,6 +3752,8 @@ void Konsole::detachSession(TESession* _se) { _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), + _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); } } } |