summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-04-21 17:49:25 +0900
committerMichele Calgaro <[email protected]>2014-04-21 17:49:25 +0900
commitdfa62cdbea831ee3fcc29ca884c779a5459d5e08 (patch)
tree5b745986dccb687ccc2609ff576c3007fc7373a7
parentf69bb8df1debfec9d20dd6069f8034263ca31049 (diff)
downloadtdebase-dfa62cdbea831ee3fcc29ca884c779a5459d5e08.tar.gz
tdebase-dfa62cdbea831ee3fcc29ca884c779a5459d5e08.zip
Added support for handling Meta key as Alt key in Konsole.
This relates to bug 1026.
-rw-r--r--konsole/konsole/konsole.cpp11
-rw-r--r--konsole/konsole/konsole.h1
2 files changed, 11 insertions, 1 deletions
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 26d35602e..f59ae83da 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -273,6 +273,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
,b_autoResizeTabs(false)
,b_installBitmapFonts(false)
,b_framevis(true)
+,b_metaAsAlt(false)
,b_fullscreen(false)
,m_menuCreated(false)
,b_warnQuit(false)
@@ -1622,6 +1623,7 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
b_bidiEnabled = config->readBoolEntry("EnableBidi",false);
s_word_seps= config->readEntry("wordseps",":@-./_~");
b_framevis = config->readBoolEntry("has frame",true);
+ b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false);
TQPtrList<TEWidget> tes = activeTEs();
for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
_te->setWordCharacters(s_word_seps);
@@ -1636,7 +1638,10 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
monitorSilenceSeconds=config->readUnsignedNumEntry("SilenceSeconds", 10);
for (TESession *ses = sessions.first(); ses; ses = sessions.next())
+ {
+ ses->setMetaAsAltMode(b_metaAsAlt);
ses->setMonitorSilenceSeconds(monitorSilenceSeconds);
+ }
b_xonXoff = config->readBoolEntry("XonXoff",false);
b_matchTabWinTitle = config->readBoolEntry("MatchTabWinTitle",false);
@@ -2187,7 +2192,9 @@ void Konsole::reparseConfiguration()
curr_schema = sch->numb();
pmPath = sch->imagePath();
- for (TESession *_se = sessions.first(); _se; _se = sessions.next()) {
+ for (TESession *_se = sessions.first(); _se; _se = sessions.next())
+ {
+ _se->setMetaAsAltMode(b_metaAsAlt);
ColorSchema* s = colors->find( _se->schemaNo() );
if (s) {
if (s->hasSchemaFileChanged())
@@ -2951,6 +2958,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
s->setProgram(TQFile::encodeName(program),cmdArgs);
s->setMonitorSilenceSeconds(monitorSilenceSeconds);
s->enableFullScripting(b_fullScripting);
+ s->setMetaAsAltMode(b_metaAsAlt);
+
// If you add any new signal-slot connection below, think about doing it in konsolePart too
connect( s,TQT_SIGNAL(done(TESession*)),
this,TQT_SLOT(doneSession(TESession*)));
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index 6bd3a2e81..976ac5cf8 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -435,6 +435,7 @@ private:
bool b_installBitmapFonts;
bool b_framevis:1;
+ bool b_metaAsAlt:1;
bool b_fullscreen:1;
bool m_menuCreated:1;
bool b_warnQuit:1;