author | llornkcor <llornkcor> | 2002-04-05 13:17:19 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-05 13:17:19 (UTC) |
commit | 1896c5fa43e465567595feb442013d75c476f090 (patch) (side-by-side diff) | |
tree | e8ea13fd45277f0b8d7af52f4938f411fd9ed4af /core/apps/embeddedkonsole/konsole.cpp | |
parent | dd5bc1f9d61cdd8cfde4c7a7fbba3b53b77b2670 (diff) | |
download | opie-1896c5fa43e465567595feb442013d75c476f090.zip opie-1896c5fa43e465567595feb442013d75c476f090.tar.gz opie-1896c5fa43e465567595feb442013d75c476f090.tar.bz2 |
Folded in changes I forgot about. Added -e argument to execute a command and leave the konsole,
and also setDocument to exec command in new session if open. so a command run like
$OPIEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V'
will run that command in a new session (tab). So now scripts can be run from an icon, and such.
Diffstat (limited to 'core/apps/embeddedkonsole/konsole.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index 217d8d8..16ff4df 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp @@ -19,4 +19,5 @@ /* */ /* -------------------------------------------------------------------------- */ +// enhancements added by L.J. Potter <ljp@llornkcor.com> #include <qpe/resource.h> @@ -202,5 +203,5 @@ void Konsole::init(const char* _pgm, QStrList & _args) n_keytab = 0; n_render = 0; - + startUp=0; setCaption( tr("Terminal") ); setIcon( Resource::loadPixmap( "konsole" ) ); @@ -365,4 +366,5 @@ void Konsole::init(const char* _pgm, QStrList & _args) se_args = _args; +parseCommandLine(); // read and apply default values /////////////////////////////////////////// resize(321, 321); // Dummy. @@ -370,5 +372,4 @@ void Konsole::init(const char* _pgm, QStrList & _args) if (currentSize != size()) defaultSize = size(); - } @@ -390,5 +391,5 @@ Konsole::~Konsole() while (nsessions > 0) { doneSession(getTe()->currentSession, 0); - } + } Config cfg("Konsole"); @@ -844,2 +845,40 @@ void Konsole::editCommandListMenuSelected(int iD) } + +// $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V' +void Konsole::setDocument( const QString &cmd) { + newSession(); + TEWidget* te = getTe(); + if(cmd.find("-e", 0, TRUE) != -1) { + QString cmd2; + cmd2=cmd.right(cmd.length()-3)+" &"; + system(cmd2.latin1()); + if(startUp <= 1 && nsessions < 2) { + doneSession(getTe()->currentSession, 0); + exit(0); + } else + doneSession(getTe()->currentSession, 0); + } else { + if (te != 0) { + te->emitText(cmd+"\r"); + } + } + startUp++; +} + +void Konsole::parseCommandLine() { + QString cmd; + // newSession(); + for (int i=1;i< qApp->argc();i++) { + if( QString(qApp->argv()[i]) == "-e") { + i++; + for ( int j=i;j< qApp->argc();j++) { + cmd+=QString(qApp->argv()[j])+" "; + } + cmd.stripWhiteSpace(); + system(cmd.latin1()); + exit(0);//close(); + } // end -e switch + } + startUp++; +} |