15 files changed, 123 insertions, 31 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index 16bb5ff..984e347 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -65,97 +65,96 @@
 #include <qapplication.h>
 #include <qsocketnotifier.h>
 #include <qstring.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <termios.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #ifdef HAVE_OPENPTY
 #include <pty.h>
 #endif
 #include "procctl.h"
 #include "MyPty.h"
 #undef VERBOSE_DEBUG
 /* -------------------------------------------------------------------------- */
 /*!
   Informs the client program about the
   actual size of the window.
 */
 void MyPty::setSize(int lines, int columns)
 {
    qWarning("setting size");
  struct winsize wsize;
  wsize.ws_row = (unsigned short)lines;
  wsize.ws_col = (unsigned short)columns;
  if(m_fd < 0) return;
  ioctl(m_fd,TIOCSWINSZ,(char *)&wsize);
 }
 void MyPty::donePty()
 {
    // This is code from the Qt DumbTerminal example
-    int status = 0;
    ::close(m_fd);
    if (m_cpid) {
        kill(m_cpid, SIGHUP);
        //waitpid(m_cpid, &status, 0);
        delete m_sn_e;
        delete m_sn_r;
        m_sn_e = 0l;
        m_sn_r = 0l;
    }
    m_cpid = 0;
    m_fd = -1;
 //    emit done(status);
 }
 const char* MyPty::deviceName()
 {
    return m_ttynam;
 }
 void MyPty::error()
 {
    // This is code from the Qt DumbTerminal example
    donePty();
 }
 void MyPty::start() {
    char* cmd = "/bin/sh";
    QStrList lis;
    int r =run(cmd, lis, 0, 0);
    r = r;
 }
 /*!
    start the client program.
 */
 int MyPty::run(const char* cmd, QStrList &, const char*, int)
 {
    // This is code from the Qt DumbTerminal example
    m_cpid = fork();
    if ( !m_cpid ) {
        // child - exec shell on tty
        for (int sig = 1; sig < NSIG; sig++) signal(sig,SIG_DFL);
        int ttyfd = ::open(m_ttynam, O_RDWR);
@@ -212,96 +211,97 @@ int MyPty::openPty()
        close(ttyfd); // we open the ttynam ourselves.
 #else
    for (const char* c0 = "pqrstuvwxyzabcde"; ptyfd < 0 && *c0 != 0; c0++) {
        for (const char* c1 = "0123456789abcdef"; ptyfd < 0 && *c1 != 0; c1++) {
            sprintf(m_ptynam,"/dev/pty%c%c",*c0,*c1);
            sprintf(m_ttynam,"/dev/tty%c%c",*c0,*c1);
            if ((ptyfd = ::open(m_ptynam,O_RDWR)) >= 0) {
                if (geteuid() != 0 && !access(m_ttynam,R_OK|W_OK) == 0) {
                    ::close(ptyfd);
                    ptyfd = -1;
                }
            }
        }
    }
 #endif
    if ( ptyfd < 0 ) {
        //qApp->exit(1);
        return -1;
    }
    return ptyfd;
 }
 /*!
    Create an instance.
 */
 MyPty::MyPty(const Profile& prof) : m_cpid(0)
 {
    int term = prof.readNumEntry("Terminal", Profile::VT100 );
    switch( term ) {
    default:
    case Profile::VT100:
    case Profile::VT102:
        m_term = "vt100";
        break;
    case Profile::Linux:
        m_term = "linux";
        break;
    case Profile::XTerm:
        m_term = "xterm";
        break;
    }
    m_sn_e = 0l;
    m_sn_r = 0l;
  m_fd = openPty();
  ProcCtl* ctl = ProcCtl::self();
+  Q_UNUSED(ctl);
 }
 /*!
    Destructor.
    Note that the related client program is not killed
    (yet) when a instance is deleted.
 */
 MyPty::~MyPty()
 {
    donePty();
 }
 QString MyPty::identifier()const {
    return QString::fromLatin1("term");
 }
 QString MyPty::name()const{
    return identifier();
 }
 bool MyPty::open() {
    if (m_fd < 0)
        m_fd = openPty();
    start();
    return true;
 }
 void MyPty::close() {
    donePty();
    m_fd = openPty();
 }
 void MyPty::reload( const Profile& ) {
 }
 /*! sends len bytes through the line */
 void MyPty::send(const QByteArray& ar)
 {
 #ifdef VERBOSE_DEBUG
  // verbose debug
  printf("sending bytes:\n");
  for (uint i = 0; i < ar.count(); i++)
    printf("%c", ar[i]);
  printf("\n");
 #endif
  ::write(m_fd, ar.data(), ar.count());
 }
 /*! indicates that a block of data is received */
 void MyPty::readPty()
 {
diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp
index f3f462f..e4415dc 100644
--- a/noncore/apps/opie-console/TEWidget.cpp
+++ b/noncore/apps/opie-console/TEWidget.cpp
@@ -50,96 +50,121 @@
 // #include "config.h"
 #include "TEWidget.h"
 #include "session.h"
 #include <qpe/config.h>
 #include <qapplication.h>
 #include <qcursor.h>
 #include <qregexp.h>
 #include <qpainter.h>
 #include <qclipboard.h>
 #include <qstyle.h>
 #include <qfile.h>
 #include <qdragobject.h>
 #include <qvbox.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <assert.h>
 // #include "TEWidget.moc"
 //#include <kapp.h>
 //#include <kcursor.h>
 //#include <kurl.h>
 //#include <kdebug.h>
 //#include <klocale.h>
 #define HERE printf("%s(%d): %s\n",__FILE__,__LINE__,__FUNCTION__)
 #define HCNT(Name) // { static int cnt = 1; printf("%s(%d): %s %d\n",__FILE__,__LINE__,Name,cnt++); }
 #define loc(X,Y) ((Y)*columns+(X))
 //FIXME: the rim should normally be 1, 0 only when running in full screen mode.
 #define rimX 0      // left/right rim width
 #define rimY 0      // top/bottom rim high
 #define SCRWIDTH 16 // width of the scrollbar
 #define yMouseScroll 1
 // scroll increment used when dragging selection at top/bottom of window.
+/* Button XPM */
+namespace {
+static char * menu_xpm[] = {
+"12 12 5 1",
+        " c None",
+        ".c #000000",
+        "+c #FFFDAD",
+        "@c #FFFF00",
+        "#c #E5E100",
+"            ",
+"            ",
+"  ......... ",
+"  .+++++++. ",
+"  .+@@@@#.  ",
+"  .+@@@#.   ",
+"  .+@@#.    ",
+"  .+@#.     ",
+"  .+#.      ",
+"  .+.       ",
+"  ..        ",
+"            "};
+}
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                Colors                                     */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 //FIXME: the default color table is in session.C now.
 //       We need a way to get rid of this one, here.
 static const ColorEntry base_color_table[TABLE_COLORS] =
 // The following are almost IBM standard color codes, with some slight
 // gamma correction for the dim colors to compensate for bright X screens.
 // It contains the 8 ansiterm/xterm colors in 2 intensities.
 {
  // Fixme: could add faint colors here, also.
  // normal
  ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 1, 0 ), // Dfore, Dback
  ColorEntry(QColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0x18), 0, 0 ), // Black, Red
  ColorEntry(QColor(0x18,0xB2,0x18), 0, 0 ), ColorEntry( QColor(0xB2,0x68,0x18), 0, 0 ), // Green, Yellow
  ColorEntry(QColor(0x18,0x18,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ), // Blue,  Magenta
  ColorEntry(QColor(0x18,0xB2,0xB2), 0, 0 ), ColorEntry( QColor(0xB2,0xB2,0xB2), 0, 0 ), // Cyan,  White
  // intensiv
  ColorEntry(QColor(0x00,0x00,0x00), 0, 1 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 1, 0 ),
  ColorEntry(QColor(0x68,0x68,0x68), 0, 0 ), ColorEntry( QColor(0xFF,0x54,0x54), 0, 0 ),
  ColorEntry(QColor(0x54,0xFF,0x54), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0x54), 0, 0 ),
  ColorEntry(QColor(0x54,0x54,0xFF), 0, 0 ), ColorEntry( QColor(0xB2,0x18,0xB2), 0, 0 ),
  ColorEntry(QColor(0x54,0xFF,0xFF), 0, 0 ), ColorEntry( QColor(0xFF,0xFF,0xFF), 0, 0 )
 };
 /* Note that we use ANSI color order (bgr), while IBMPC color order is (rgb)
   Code        0       1       2       3       4       5       6       7
   ----------- ------- ------- ------- ------- ------- ------- ------- -------
   ANSI  (bgr) Black   Red     Green   Yellow  Blue    Magenta Cyan    White
   IBMPC (rgb) Black   Blue    Green   Cyan    Red     Magenta Yellow  White
 */
 QColor TEWidget::getDefaultBackColor()
 {
  return color_table[DEFAULT_BACK_COLOR].color;
 }
 const ColorEntry* TEWidget::getColorTable() const
 {
  return color_table;
 }
 const ColorEntry* TEWidget::getdefaultColorTable() const
 {
@@ -1196,83 +1221,83 @@ void TEWidget::dropEvent(QDropEvent* event)
  int file_count = 0;
  dropText = "";
  bool bPopup = true;
  if(QUriDrag::decode(event, strlist)) {
    if (strlist.count()) {
      for(const char* p = strlist.first(); p; p = strlist.next()) {
        if(file_count++ > 0) {
          dropText += " ";
          bPopup = false; // more than one file, don't popup
        }
 /*
        KURL url(p);
        if (url.isLocalFile()) {
          dropText += url.path(); // local URL : remove protocol
        }
        else {
          dropText += url.prettyURL();
          bPopup = false; // a non-local file, don't popup
        }
 */
      }
      if (bPopup)
        // m_drop->popup(pos() + event->pos());
  m_drop->popup(mapToGlobal(event->pos()));
      else
  {
    if (currentSession) {
      currentSession->getEmulation()->sendString(dropText.local8Bit());
    }
 //    kdDebug() << "Drop:" << dropText.local8Bit() << "\n";
  }
    }
  }
  else if(QTextDrag::decode(event, dropText)) {
 //    kdDebug() << "Drop:" << dropText.local8Bit() << "\n";
    if (currentSession) {
      currentSession->getEmulation()->sendString(dropText.local8Bit());
    }
    // Paste it
  }
 }
 #endif
-void TEWidget::drop_menu_activated(int item)
+void TEWidget::drop_menu_activated(int)
 {
 #ifndef QT_NO_DRAGANDDROP
  switch (item)
  {
    case 0: // paste
      currentSession->getEmulation()->sendString(dropText.local8Bit());
 //    KWM::activate((Window)this->winId());
      break;
    case 1: // cd ...
      currentSession->getEmulation()->sendString("cd ");
      struct stat statbuf;
      if ( ::stat( QFile::encodeName( dropText ), &statbuf ) == 0 )
      {
        if ( !S_ISDIR(statbuf.st_mode) )
        {
 /*
          KURL url;
          url.setPath( dropText );
          dropText = url.directory( true, false ); // remove filename
 */
        }
      }
      dropText.replace(QRegExp(" "), "\\ "); // escape spaces
      currentSession->getEmulation()->sendString(dropText.local8Bit());
      currentSession->getEmulation()->sendString("\n");
 //    KWM::activate((Window)this->winId());
      break;
  }
 #endif
 }
 QPushButton* TEWidget::cornerButton() {
    return m_cornerButton;
 }
diff --git a/noncore/apps/opie-console/TEWidget.h b/noncore/apps/opie-console/TEWidget.h
index 1b5300f..f03a16e 100644
--- a/noncore/apps/opie-console/TEWidget.h
+++ b/noncore/apps/opie-console/TEWidget.h
@@ -1,103 +1,85 @@
 /* ----------------------------------------------------------------------- */
 /*                                                                         */
 /* [te_widget.h]           Terminal Emulation Widget                       */
 /*                                                                         */
 /* ----------------------------------------------------------------------- */
 /*                                                                         */
 /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>         */
 /*                                                                         */
 /* This file is part of Konsole - an X terminal for KDE                    */
 /*                                                                         */
 /* ----------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 #ifndef TE_WIDGET_H
 #define TE_WIDGET_H
 #include <qwidget.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qcolor.h>
 #include <qkeycode.h>
 #include <qscrollbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include "TECommon.h"
 extern unsigned short vt100_graphics[32];
-static char * menu_xpm[] = {
-"12 12 5 1",
-        " c None",
-        ".c #000000",
-        "+c #FFFDAD",
-        "@c #FFFF00",
-        "#c #E5E100",
-"            ",
-"            ",
-"  ......... ",
-"  .+++++++. ",
-"  .+@@@@#.  ",
-"  .+@@@#.   ",
-"  .+@@#.    ",
-"  .+@#.     ",
-"  .+#.      ",
-"  .+.       ",
-"  ..        ",
-"            "};
 class TESession;
 // class Konsole;
 class TEWidget : public QFrame
 // a widget representing attributed text
 {
    Q_OBJECT
 //  friend class Konsole;
 public:
    TEWidget(QWidget *parent=0, const char *name=0);
    virtual ~TEWidget();
 public:
    QColor getDefaultBackColor();
    QPushButton *cornerButton();
    const ColorEntry* getColorTable() const;
    const ColorEntry* getdefaultColorTable() const;
    void              setColorTable(const ColorEntry table[]);
    void setScrollbarLocation(int loc);
    enum { SCRNONE=0, SCRLEFT=1, SCRRIGHT=2 };
    void setScroll(int cursor, int lines);
    void doScroll(int lines);
    void emitSelection();
 public:
    void setImage(const ca* const newimg, int lines, int columns);
    int  Lines()   { return lines;   }
    int  Columns() { return columns; }
    void calcGeometry();
    void propagateSize();
    QSize calcSize(int cols, int lins) const;
    QSize sizeHint() const;
 public:
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index bdc8b43..bb3dd28 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -147,48 +147,54 @@ QColor EmulationHandler::backColor(int col ) {
        /* color is white */
        co = Qt::black;
        break;
    case Profile::Black:
        co = Qt::white;
        break;
    case Profile::Green:
        qWarning("Background black");
        co = Qt::black;
        break;
    case Profile::Orange:
        qWarning("Background black");
        co = Qt::black;
        break;
    }
    return co;
 }
 QPushButton*  EmulationHandler::cornerButton() {
    return m_teWid->cornerButton();
 }
 Script *EmulationHandler::script() {
    return m_script;
 }
 bool EmulationHandler::isRecording() {
    return (m_script != 0);
 }
 void EmulationHandler::startRecording() {
    if (!isRecording())
        m_script = new Script();
 }
 void EmulationHandler::clearScript() {
    if (isRecording()) {
        delete m_script;
        m_script = 0;
    }
 }
 void EmulationHandler::runScript(const Script *script) {
    emit send(script->script());
 }
+void EmulationHandler::copy() {
+    m_teWid->emitSelection();
+}
+void EmulationHandler::paste() {
+    m_teWid->pasteClipboard();
+}
diff --git a/noncore/apps/opie-console/emulation_handler.h b/noncore/apps/opie-console/emulation_handler.h
index 7ca2cf3..12abbc5 100644
--- a/noncore/apps/opie-console/emulation_handler.h
+++ b/noncore/apps/opie-console/emulation_handler.h
@@ -4,87 +4,89 @@
 #include <qobject.h>
 #include <qcolor.h>
 #include <qcstring.h>
 /*
 * Badly ibotty lacks the time to finish
 * his widget in time..
 * Never the less we've to have an EmulationWidget
 * This is why I'm taking the inferior not cleaned
 * up TE* KDE STUFF
 */
 /**
 * This is the layer above the IOLayer*
 * This nice QObject here will get stuff from
 * got a slot and a signal
 * the signal for data
 * the slot for receiving
 * it'll set up the widget internally
 * and manage the communication between
 * the pre QByteArray world!
 */
 class Profile;
 class QWidget;
 class QPushButton;
 class TEWidget;
 class TEmulation;
 class QFont;
 class Script;
 class EmulationHandler : public QObject {
    Q_OBJECT
 public:
    /**
     * simple c'tor the parent of the TEWdiget
     * and a name
     * and a Profile
     */
    EmulationHandler( const Profile&, QWidget* parent, const char* name = 0l );
    /**
     * delete all components
     */
    ~EmulationHandler();
    void load( const Profile& );
    QWidget* widget();
    void setColor( const QColor& fore, const QColor& back );
    QPushButton* cornerButton();
-  
    /* Scripts */
    /* Create a new script and record all typed characters */
    void startRecording();
    /* Return whether we are currently recording a script */
    bool isRecording();
    /* Return the current script (or NULL) */
    Script *script();
    /* Stop recording and remove the current script from memory */
    void clearScript();
    /* Run a script by forwarding its keys to the EmulationLayer */
    void runScript(const Script *);
 signals:
    void send( const QByteArray& );
    void changeSize(int rows, int cols );
 public slots:
    void recv( const QByteArray& );
+    void paste();
+    void copy();
 private slots:
    void recvEmulation( const char*,  int len );
 private:
    QFont font( int );
    QColor foreColor(int );
    QColor backColor(int );
 private:
    TEWidget* m_teWid;
    TEmulation* m_teEmu;
    Script * m_script;
 };
 #endif
diff --git a/noncore/apps/opie-console/file_layer.cpp b/noncore/apps/opie-console/file_layer.cpp
index 43e9c8f..0c83700 100644
--- a/noncore/apps/opie-console/file_layer.cpp
+++ b/noncore/apps/opie-console/file_layer.cpp
@@ -1,23 +1,23 @@
 #include <qfile.h>
 #include <opie/oprocess.h>
 #include "file_layer.h"
 FileTransferLayer::FileTransferLayer(IOLayer *layer)
    : QObject(), m_layer( layer )
 {
 }
 FileTransferLayer::~FileTransferLayer() {
 }
-void FileTransferLayer::sendFile(const QFile& file) {
+void FileTransferLayer::sendFile(const QFile&) {
 }
-void FileTransferLayer::sendFile(const QString& file) {
+void FileTransferLayer::sendFile(const QString&) {
 }
 IOLayer* FileTransferLayer::layer() {
    return m_layer;
 }
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 4486eea..8dd8151 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,77 +1,80 @@
 #include "io_bt.h"
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
 }
 IOBt::~IOBt() {
    if ( m_attach ) {
        delete m_attach;
    }
 }
 void IOBt::close() {
    IOSerial::close();
    // still need error handling
    if ( m_attach ) {
        delete m_attach;
        m_attach = 0;
    }
 }
 bool IOBt::open() {
+    bool ret = false;
    // only set up bt stuff if mac address was set, otherwise use the device set
    if ( !m_mac.isEmpty() ) {
        // now it should also be checked, if there is a connection to the device with that mac allready
        // hciattach here
        m_attach = new OProcess();
        *m_attach << "hciattach /dev/ttyS2 any 57600";
        // then start hcid, then rcfomm handling (m_mac)
        connect( m_attach, SIGNAL( processExited( OProcess* ) ),
                 this, SLOT( slotExited( OProcess* ) ) );
        if ( m_attach->start() ) {
-            IOSerial::open();
+            ret = IOSerial::open();
        } else {
            qWarning("could not attach to device");
            delete m_attach;
            m_attach = 0;
        }
    } else {
        // directly to the normal serial
        // TODO: look first if the connection really exists. ( is set up )
-        IOSerial::open();
+        ret =IOSerial::open();
    }
+    return ret;
 }
 void IOBt::reload( const Profile &config ) {
    m_device = config.readEntry("Device", BT_DEFAULT_DEVICE);
    m_mac = config.readEntry("Mac", BT_DEFAULT_MAC);
    m_baud = config.readNumEntry("Baud", BT_DEFAULT_BAUD);
    m_parity = config.readNumEntry("Parity", BT_DEFAULT_PARITY);
    m_dbits = config.readNumEntry("DataBits", BT_DEFAULT_DBITS);
    m_sbits = config.readNumEntry("StopBits", BT_DEFAULT_SBITS);
    m_flow = config.readNumEntry("Flow", BT_DEFAULT_FLOW);
 }
 QString IOBt::identifier() const {
    return "bluetooth";
 }
 QString IOBt::name() const {
    return "BLuetooth IO Layer";
 }
 void IOBt::slotExited( OProcess* proc ){
    close();
+    delete proc;
 }
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index 56a373c..b3b693f 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -1,62 +1,65 @@
 #include "io_irda.h"
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
 }
 IOIrda::~IOIrda() {
    if ( m_attach ) {
        delete m_attach;
    }
 }
 void IOIrda::close() {
    IOSerial::close();
    // still need error handling
    delete m_attach;
 }
 bool IOIrda::open() {
+    bool ret;
    // irdaattach here
    m_attach = new OProcess();
    *m_attach << "irattach /dev/ttyS2 -s";
    connect( m_attach, SIGNAL( processExited( OProcess* ) ),
            this, SLOT( slotExited( OProcess* ) ) );
    if ( m_attach->start() ) {
-        IOSerial::open();
+        ret= IOSerial::open();
    } else {
    // emit error!!!
        qWarning("could not attach to device");
        delete m_attach;
        m_attach = 0l;
    }
+    return ret;
 }
 void IOIrda::reload( const Profile &config ) {
    m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE);
    m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD);
    m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY);
    m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS);
    m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS);
    m_flow = config.readNumEntry("Flow", IRDA_DEFAULT_FLOW);
 }
 QString IOIrda::identifier() const {
    return "irda";
 }
 QString IOIrda::name() const {
    return "Irda IO Layer";
 }
 void IOIrda::slotExited(OProcess* proc ){
    close();
+    delete proc;
 }
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index e2f4d12..02a3fa9 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -44,229 +44,253 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(
    m_manager->load();
    initUI();
    populateProfiles();
 }
 void MainWindow::initUI() {
    setToolBarsMovable( FALSE  );
    /* tool bar for the menu */
    m_tool = new QToolBar( this );
    m_tool->setHorizontalStretchable( TRUE );
    m_bar = new QMenuBar( m_tool );
    m_console = new QPopupMenu( this );
    m_scripts = new QPopupMenu( this );
    m_sessionsPop= new QPopupMenu( this );
    //m_settings = new QPopupMenu( this );
    /* add a toolbar for icons */
    m_icons = new QToolBar(this);
    /*
     * the settings action
     */
    m_setProfiles = new QAction(tr("Configure Profiles"),
                             Resource::loadPixmap( "SettingsIcon" ),
                             QString::null, 0, this, 0);
    //  m_setProfiles->addTo( m_settings );
    m_setProfiles->addTo( m_icons );
    m_setProfiles->addTo( m_console );
    connect( m_setProfiles, SIGNAL(activated() ),
             this, SLOT(slotConfigure() ) );
    m_console->insertSeparator();
    /*
     * new Action for new sessions
     */
    QAction* a = new QAction(tr("New Connection"),
                             Resource::loadPixmap( "new" ),
                             QString::null, 0, this, 0);
    a->addTo( m_console );
    a->addTo( m_icons );
    connect(a, SIGNAL(activated() ),
            this, SLOT(slotNew() ) );
+    m_console->insertSeparator();
+    /* save icon is not available */
+    a = new QAction(tr("Save Connection"),
+                    Resource::loadPixmap("save"), QString::null,
+                    0, this, 0 );
+    a->addTo( m_console );
+    connect(a, SIGNAL(activated() ),
+            this, SLOT(slotSaveSession() ) );
+    m_console->insertSeparator();
    /*
     * connect action
     */
    m_connect = new QAction();
    m_connect->setText( tr("Connect") );
    m_connect->addTo( m_console );
    connect(m_connect, SIGNAL(activated() ),
            this, SLOT(slotConnect() ) );
    /*
     * disconnect action
     */
    m_disconnect = new QAction();
    m_disconnect->setText( tr("Disconnect") );
    m_disconnect->addTo( m_console );
    connect(m_disconnect, SIGNAL(activated() ),
            this, SLOT(slotDisconnect() ) );
    m_console->insertSeparator();
    m_transfer = new QAction();
    m_transfer->setText( tr("Transfer file...") );
    m_transfer->addTo( m_console );
    connect(m_transfer, SIGNAL(activated() ),
            this, SLOT(slotTransfer() ) );
    /*
     * fullscreen
     */
    m_isFullscreen = false;
    m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" )
                           , QString::null, 0, this, 0);
    m_fullscreen->addTo( m_console );
    m_fullscreen->addTo( m_icons );
    connect( m_fullscreen, SIGNAL( activated() ),
             this,  SLOT( slotFullscreen() ) );
    m_console->insertSeparator();
    /*
     * terminate action
     */
    m_terminate = new QAction();
    m_terminate->setText( tr("Terminate") );
    m_terminate->addTo( m_console );
    connect(m_terminate, SIGNAL(activated() ),
            this, SLOT(slotTerminate() ) );
    m_closewindow = new QAction();
    m_closewindow->setText( tr("Close Window") );
    m_closewindow->addTo( m_console );
    connect( m_closewindow, SIGNAL(activated() ),
            this, SLOT(slotClose() ) );
    /*
     * script actions
     */
    m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0);
    m_recordScript->addTo(m_scripts);
    connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript()));
    m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0);
    m_saveScript->addTo(m_scripts);
    connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript()));
    m_runScript = new QAction(tr("Run Script"), QString::null, 0, this, 0);
    m_runScript->addTo(m_scripts);
    connect(m_runScript, SIGNAL(activated()), this, SLOT(slotRunScript()));
    /*
     * action that open/closes the keyboard
     */
    m_openKeys = new QAction (tr("Open Keyboard..."),
                             Resource::loadPixmap( "down" ),
                             QString::null, 0, this, 0);
    m_openKeys->setToggleAction(true);
    connect (m_openKeys, SIGNAL(toggled(bool)),
             this, SLOT(slotOpenKeb(bool)));
    m_openKeys->addTo(m_icons);
    /*
     * action that open/closes the keyboard
- 
    m_openButtons = new QAction ( tr( "Open Buttons..." ),
                             Resource::loadPixmap( "" ),
                             QString::null, 0, this, 0 );
    m_openButtons->setToggleAction( true );
    connect ( m_openButtons, SIGNAL( toggled( bool ) ),
             this, SLOT( slotOpenButtons( bool ) ) );
    m_openButtons->addTo( m_icons );
    */
    /* insert the submenu */
    m_console->insertItem(tr("New from Profile"), m_sessionsPop,
                          -1, 0);
    /* insert the connection menu */
    m_bar->insertItem( tr("Connection"), m_console );
    /* the scripts menu */
    m_bar->insertItem( tr("Scripts"), m_scripts );
    /* the settings menu */
    // m_bar->insertItem( tr("Settings"), m_settings );
    /* and the keyboard */
    m_keyBar = new QToolBar(this);
    addToolBar( m_keyBar,  "Keyboard", QMainWindow::Top, TRUE );
    m_keyBar->setHorizontalStretchable( TRUE );
    m_keyBar->hide();
    m_kb = new FunctionKeyboard(m_keyBar);
    connect(m_kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)),
            this, SLOT(slotKeyReceived(FKey, ushort, ushort, bool)));
    m_buttonBar = new QToolBar( this );
    addToolBar( m_buttonBar, "Buttons",  QMainWindow::Top, TRUE );
    m_buttonBar->setHorizontalStretchable( TRUE );
    m_buttonBar->hide();
    /*
    m_qb = new QuickButton( m_buttonBar );
    connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ),
            this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) );
    */
+    /* now add the copy and paste actions */
+    a = new QAction(tr("Copy"),
+                    Resource::loadPixmap("copy"), QString::null,
+                    0, this, 0 );
+    //a->addTo( m_icons );
+    connect( a, SIGNAL(activated() ),
+             this, SLOT(slotCopy() ) );
+    a = new QAction(tr("Paste"),
+                    Resource::loadPixmap("paste"), QString::null,
+                    0, this, 0 );
+    a->addTo( m_icons );
+    connect( a, SIGNAL(activated() ),
+             this, SLOT(slotPaste() ) );
    m_connect->setEnabled( false );
    m_disconnect->setEnabled( false );
    m_terminate->setEnabled( false );
    m_transfer->setEnabled( false );
    m_recordScript->setEnabled( false );
    m_saveScript->setEnabled( false );
    m_runScript->setEnabled( false );
    m_fullscreen->setEnabled( false );
    m_closewindow->setEnabled( false );
    /*
     * connect to the menu activation
     */
    connect( m_sessionsPop, SIGNAL(activated( int ) ),
             this, SLOT(slotProfile( int ) ) );
    m_consoleWindow = new TabWidget( this, "blah");
    connect(m_consoleWindow, SIGNAL(activated(Session*) ),
            this, SLOT(slotSessionChanged(Session*) ) );
    setCentralWidget( m_consoleWindow );
 }
 ProfileManager* MainWindow::manager() {
    return m_manager;
 }
 TabWidget* MainWindow::tabWidget() {
    return m_consoleWindow;
 }
 void MainWindow::populateProfiles() {
    m_sessionsPop->clear();
    Profile::ValueList list = manager()->all();
    for (Profile::ValueList::Iterator it = list.begin(); it != list.end(); ++it ) {
        m_sessionsPop->insertItem( (*it).name() );
    }
 }
 MainWindow::~MainWindow() {
    delete m_factory;
    manager()->save();
 }
 MetaFactory* MainWindow::factory() {
    return m_factory;
 }
@@ -494,48 +518,71 @@ void MainWindow::slotSessionChanged( Session* ses ) {
        if(w) w->setFocus();
    }
 }
 void MainWindow::slotFullscreen() {
    if ( m_isFullscreen ) {
        ( m_curSession->widgetStack() )->reparent(  savedParentFullscreen, 0, QPoint(0,0), true );
        ( m_curSession->widgetStack() )->resize( savedParentFullscreen->width(), savedParentFullscreen->height() );
        ( m_curSession->emulationHandler() )->cornerButton()->hide();
        disconnect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
    } else {
        savedParentFullscreen = ( m_curSession->widgetStack() )->parentWidget();
        ( m_curSession->widgetStack() )->setFrameStyle( QFrame::NoFrame );
        ( m_curSession->widgetStack() )->reparent( 0, WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop
                                                   , QPoint(0,0), false );
        ( m_curSession->widgetStack() )->resize( qApp->desktop()->width(), qApp->desktop()->height() );
        ( m_curSession->widgetStack() )->setFocus();
        ( m_curSession->widgetStack() )->show();
        ( ( m_curSession->emulationHandler() )->cornerButton() )->show();
        connect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
    }
    m_isFullscreen = !m_isFullscreen;
 }
 void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
    if ( m_curSession ) {
        QEvent::Type state;
        if (pressed) state = QEvent::KeyPress;
        else state = QEvent::KeyRelease;
        QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
        // where should i send this event? doesnt work sending it here
        QApplication::sendEvent((QObject *)m_curSession->widget(), &ke);
        ke.ignore();
    }
 }
+void MainWindow::slotCopy() {
+    if (!currentSession() ) return;
+    currentSession()->emulationHandler()->copy();
+}
+void MainWindow::slotPaste() {
+    if (!currentSession() ) return;
+    currentSession()->emulationHandler()->paste();
+}
+/*
+ * Save the session
+ */
+void MainWindow::slotSaveSession() {
+    if (!currentSession() ) {
+      QMessageBox::information(this, tr("Save Connection"),
+                                          tr("<qt>There is no Connection.</qt>"), 1 );
+      return;
+    }
+    manager()->add( currentSession()->profile() );
+    manager()->save();
+    populateProfiles();
+}
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index 0f52e76..16b6252 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -25,96 +25,103 @@ class QuickButton;
 class MainWindow : public QMainWindow {
    Q_OBJECT
 public:
    MainWindow( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
    ~MainWindow();
    /**
     * our factory to generate IOLayer and so on
     *
     */
    MetaFactory* factory();
    /**
     * A session contains a QWidget*,
     * an IOLayer* and some infos for us
     */
    Session* currentSession();
    /**
     * the session list
     */
    QList<Session> sessions();
    /**
     *
     */
    ProfileManager* manager();
    TabWidget* tabWidget();
 private slots:
    void slotNew();
    void slotConnect();
    void slotDisconnect();
    void slotTerminate();
    void slotConfigure();
    void slotClose();
    void slotProfile(int);
    void slotTransfer();
    void slotOpenKeb(bool);
    void slotOpenButtons(bool);
    void slotRecordScript();
    void slotSaveScript();
    void slotRunScript();
    void slotFullscreen();
    void slotSessionChanged( Session* );
    void slotKeyReceived(FKey, ushort, ushort, bool);
+    /* what could these both slot do? */
+    void slotCopy();
+    void slotPaste();
+    /* save the currentSession() to Profiles */
+    void slotSaveSession();
 private:
    void initUI();
    void populateProfiles();
    void create( const Profile& );
    /**
     * the current session
     */
    Session* m_curSession;
    /**
     * the session list
     */
    QList<Session> m_sessions;
    /**
     * the metafactory
     */
    MetaFactory* m_factory;
    ProfileManager* m_manager;
    TabWidget* m_consoleWindow;
    QToolBar* m_tool;
    QToolBar* m_icons;
    QToolBar* m_keyBar;
    QToolBar* m_buttonBar;
    QMenuBar* m_bar;
    QPopupMenu* m_console;
    QPopupMenu* m_settings;
    QPopupMenu* m_sessionsPop;
    QPopupMenu* m_scripts;
    QAction* m_connect;
    QAction* m_disconnect;
    QAction* m_terminate;
    QAction* m_transfer;
    QAction* m_setProfiles;
    QAction* m_openKeys;
    QAction* m_openButtons;
    QAction* m_recordScript;
    QAction* m_saveScript;
    QAction* m_runScript;
    QAction* m_fullscreen;
    QAction* m_closewindow;
    FunctionKeyboard *m_kb;
    QuickButton *m_qb;
    bool m_isFullscreen;
    QWidget* savedParentFullscreen;
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index d41ef58..8541d22 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,10 +1,10 @@
-Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* etc/keytabs/default.Keytab
+Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* etc/keytabs/default.Keytab bin/sz bin/rz
 Priority: optional
 Section: opie/applications
 Maintainer: Opie team <opie@handhelds.org>
 Architecture: arm
 Version: 0.6-$SUB_VERSION
 Depends: qpe-base ($QPE_VERSION), libopie ($QPE_VERSION), opie-console-help-en
 License: GPL
 Description: Opie terminal app
 
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index 5d39d96..cad2567 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
@@ -48,90 +48,94 @@ void ProfileManager::load() {
        /* now add it */
        m_list.append( prof );
    }
 }
 void ProfileManager::clear() {
    m_list.clear();
 }
 Profile::ValueList ProfileManager::all()const {
    return m_list;
 }
 /*
 * Our goal is to create a Session
 * We will load the the IOLayer and EmulationLayer
 * from the factory
 * we will generate a QWidgetStack
 * add a dummy widget with layout
 * add "Widget" to the layout
 * add the dummy to the stack
 * raise the dummy
 * call session->connect(=
 * this way we only need to reparent
 * in TabWidget
 */
 Session* ProfileManager::fromProfile( const Profile& prof,  QWidget* parent) {
 /* TEST PROFILE!!!
    Profile prof;
    QString str = "/dev/ttyS0";
    prof.writeEntry("Device",str );
    prof.writeEntry("Baud", 115200 );
    prof.setIOLayer("serial");
    prof.setName( "test");
 */
    Session* session = new Session();
    session->setName( prof.name() );
    /* translate the internal name to the external */
    session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) ,
                                            prof) );
    QWidgetStack *stack = new QWidgetStack( parent );
    session->setWidgetStack( stack );
    QWidget* dummy = new QHBox( stack );
    stack->raiseWidget( dummy );
    EmulationHandler* handler = new EmulationHandler(prof,dummy );
    session->setEmulationHandler( handler );
    session->connect();
+    session->setProfile( prof );
    return session;
 }
 void ProfileManager::save(  ) {
    QFile::remove( (QString(getenv("HOME") )+ "/Settings/opie-console-profiles.conf" ) );
    ProfileConfig conf("opie-console-profiles");
    Profile::ValueList::Iterator it2;
    for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) {
        conf.setGroup( (*it2).name() );
        /* now the config stuff */
        QMap<QString, QString> map =  (*it2).conf();
        QMap<QString, QString>::Iterator confIt;
        for ( confIt = map.begin(); confIt != map.end(); ++confIt ) {
            conf.writeEntry( confIt.key(), confIt.data() );
        }
        conf.writeEntry( "name", (*it2).name() );
        QString str = QString::fromUtf8( (*it2).ioLayerName() );
        conf.writeEntry( "iolayer", str );
        conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName()  ) );
        conf.writeEntry( "autoConnect", (*it2).autoConnect());
        conf.writeEntry( "back", (*it2).background() );
        conf.writeEntry( "fore", (*it2).foreground() );
        conf.writeEntry( "terminal", (*it2).terminal() );
    }
 }
+void ProfileManager::add( const Profile& prof) {
+    m_list.append( prof );
+}
 void ProfileManager::setProfiles( const Profile::ValueList& list ) {
    m_list = list;
 };
 Profile ProfileManager::profile( const QString& name )const {
    Profile prof;
    Profile::ValueList::ConstIterator it;
    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
        if ( name == (*it).name() ) {
            prof = (*it);
            break;
        }
    }
    return prof;
 }
diff --git a/noncore/apps/opie-console/receive_layer.cpp b/noncore/apps/opie-console/receive_layer.cpp
index 05e2c67..bbde339 100644
--- a/noncore/apps/opie-console/receive_layer.cpp
+++ b/noncore/apps/opie-console/receive_layer.cpp
@@ -1,33 +1,34 @@
 #include <unistd.h>
+#include <qdir.h>
 #include <qstring.h>
 #include <qfile.h>
 #include "io_layer.h"
 #include "receive_layer.h"
 ReceiveLayer::ReceiveLayer( IOLayer* lay, const QString& startDir )
    : QObject(), m_curDir( startDir ), m_layer(lay )
 {
 }
 ReceiveLayer::~ReceiveLayer() {
 }
 IOLayer* ReceiveLayer::layer() {
    return m_layer;
 }
 QString ReceiveLayer::currentDir()const{
    if (m_curDir.isEmpty() )
-        return QString::fromLocal8Bit( ::getwd(NULL) );
+        return QDir::currentDirPath();
    return m_curDir;
 }
 void ReceiveLayer::changeDir( const QString& str) {
    ::chdir( str.latin1() );
 }
 void ReceiveLayer::receive( const QString& dir, Mode, Features ) {
    receive( dir );
 }
 void ReceiveLayer::cancel() {
 }
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp
index 03d0fcd..c166d95 100644
--- a/noncore/apps/opie-console/session.cpp
+++ b/noncore/apps/opie-console/session.cpp
@@ -1,100 +1,107 @@
+#include "profile.h"
 #include "io_layer.h"
 #include "file_layer.h"
 #include "emulation_handler.h"
 #include "session.h"
 Session::Session() {
    m_widget = 0l;
    m_layer = 0l;
    m_emu = 0l;
 }
 Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay)
    : m_name( na ), m_widget( widget ), m_layer( lay )
 {
 //    m_widLay = 0l;
 //    m_emLay  = 0l;
    m_emu = 0l;
 }
 Session::~Session() {
    delete m_layer;
    delete m_emu;
    delete m_widget;
    /* the widget layer should be deleted by the m_widget */
 }
 QString Session::name()const {
    return m_name;
 }
 QWidgetStack* Session::widgetStack() {
    return m_widget;
 }
 IOLayer* Session::layer() {
    return m_layer;
 }
 EmulationHandler* Session::emulationHandler() {
    return m_emu;
 }
 QWidget* Session::widget() {
    if (!m_emu )
        return 0l;
    return m_emu->widget();
 }
+Profile Session::profile()const {
+    return m_prof;
+}
 /*
 WidgetLayer* Session::emulationWidget() {
    return m_widLay;
 }
 */
 void Session::connect() {
    if ( !m_layer || !m_emu )
        return;
    QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ),
            m_emu, SLOT(recv(const QByteArray&) ) );
    QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ),
            m_layer, SLOT(send(const QByteArray&) ) );
    QObject::connect(m_emu, SIGNAL(changeSize(int, int) ),
                     m_layer, SLOT(setSize(int, int) ) );
 }
 void Session::disconnect() {
    if ( !m_layer || !m_emu )
        return;
    QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ),
            m_emu, SLOT(recv(const QByteArray&) ) );
    QObject::disconnect(m_emu, SIGNAL(send(const QByteArray&) ),
            m_layer, SLOT(send(const QByteArray&) ) );
 }
 void Session::setName( const QString& na){
    m_name = na;
 }
 void Session::setWidgetStack( QWidgetStack* wid ) {
    delete m_emu;
    m_emu = 0l;
    delete m_widget;
    /* the EmulationLayer was destroyed... */
    m_widget = wid;
 }
 void Session::setIOLayer( IOLayer* lay ) {
    delete m_layer;
    m_layer = lay;
 }
 void Session::setEmulationHandler( EmulationHandler* lay ) {
    delete m_emu;
    m_emu = lay;
 }
+void Session::setProfile( const Profile& prof ) {
+    m_prof = prof;
+}
 /*
 void Session::setEmulationWidget( WidgetLayer* lay ) {
    delete m_widLay;
    m_widLay = lay;
 }
 */
diff --git a/noncore/apps/opie-console/session.h b/noncore/apps/opie-console/session.h
index 83b2046..f60a6c0 100644
--- a/noncore/apps/opie-console/session.h
+++ b/noncore/apps/opie-console/session.h
@@ -1,72 +1,77 @@
 #ifndef OPIE_SESSION_H
 #define OPIE_SESSION_H
 #include <qwidgetstack.h>
+#include "profile.h"
 class IOLayer;
 class EmulationHandler;
 /**
 * This is a Session. A session contains
 * a QWidget pointer and a IOLayer
 * Imagine a session like a collection of what
 * is needed to show your widget in a tab ;)
 */
 class Session {
 public:
    /**
     * c'tor with widget and layer
     * ownership get's transfered
     */
    Session();
    Session( const QString&, QWidgetStack* widget, IOLayer* );
    ~Session();
    /**
     * return the name of the session
     */
    QString name()const;
    /**
     * return the widgetstack
     * this is used to be semi modal
     * for FileTransfer
     *
     * semi modal == SessionModal
     */
    QWidgetStack* widgetStack();
    QWidget* widget();
    /**
     * return the layer
     */
    IOLayer* layer();
    EmulationHandler* emulationHandler();
+    Profile profile()const;
    /*
     * connects the data flow from
     * the IOLayer to the EmulationLayer
     */
    void connect();
    /*
     * disconnect the dataflow
     * this will be done for ft
     */
    void disconnect();
    void setWidgetStack( QWidgetStack* widget );
    void setEmulationHandler( EmulationHandler* lay );
    void setIOLayer( IOLayer*  );
    void setName( const QString& );
+    void setProfile( const Profile& );
 private:
    QString m_name;
    QWidgetStack* m_widget;
    IOLayer* m_layer;
    EmulationHandler* m_emu;
-    bool m_connected;
+    bool m_connected : 1;
+    Profile m_prof;
 };
 #endif