--- a/gui/octave-gui.pro
+++ b/gui/octave-gui.pro
@@ -58,16 +58,9 @@
 # Files associated with the project:
 SOURCES +=\
         src/lexer/lexeroctavegui.cpp \
-        src/terminal/TerminalCharacterDecoder.cpp \
         src/terminal/KeyboardTranslator.cpp \
-        src/terminal/Screen.cpp \
         src/terminal/History.cpp \
         src/terminal/konsole_wcwidth.cpp \
-        src/terminal/ScreenWindow.cpp \
-        src/terminal/Emulation.cpp \
-        src/terminal/Vt102Emulation.cpp \
-        src/terminal/TerminalDisplay.cpp \
-        src/terminal/Filter.cpp \
         src/terminal/Pty.cpp \
         src/terminal/kpty.cpp \
         src/terminal/kptyprocess.cpp \
@@ -75,7 +68,6 @@
         src/terminal/kptydevice.cpp \
         src/terminal/Session.cpp \
         src/terminal/ShellCommand.cpp \
-        src/terminal/QTerminalWidget.cpp \
         src/MainWindow.cpp \
     	  src/OctaveTerminal.cpp \
     	  src/VariablesDockWidget.cpp \
@@ -96,20 +88,13 @@
 
 HEADERS += \
         src/lexer/lexeroctavegui.h \
-        src/terminal/TerminalCharacterDecoder.h \
         src/terminal/Character.h \
         src/terminal/CharacterColor.h \
 		  src/terminal/ColorTables.h \
         src/terminal/KeyboardTranslator.h \
-        src/terminal/Screen.h \
         src/terminal/History.h \
         src/terminal/konsole_wcwidth.h \
 		  src/terminal/konsole_export.h \
-        src/terminal/ScreenWindow.h \
-        src/terminal/Emulation.h \
-        src/terminal/Vt102Emulation.h \
-        src/terminal/TerminalDisplay.h \
-        src/terminal/Filter.h \
         src/terminal/Pty.h \
         src/terminal/kpty.h \
         src/terminal/kpty_p.h \
@@ -120,7 +105,6 @@
         src/terminal/kptydevice.h \
         src/terminal/Session.h \
         src/terminal/ShellCommand.h \
-        src/terminal/QTerminalWidget.h \
     	  src/MainWindow.h \
     	  src/OctaveTerminal.h \
     	  src/VariablesDockWidget.h \

--- a/gui/src/MainWindow.cpp
+++ b/gui/src/MainWindow.cpp
@@ -22,6 +22,7 @@
 #include <QSettings>
 #include <QDesktopServices>
 #include <QFileDialog>
+#include <QMessageBox>
 #include "MainWindow.h"
 #include "FileEditorMdiSubWindow.h"
 #include "ImageViewerMdiSubWindow.h"

--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -27,6 +27,7 @@
 #include <QToolBar>
 #include <QQueue>
 #include <Qsci/qsciapis.h>
+#include <QMdiSubWindow>
 #include "ResourceManager.h"
 #include "OctaveTerminal.h"
 #include "OctaveLink.h"

--- a/gui/src/OctaveTerminal.cpp
+++ b/gui/src/OctaveTerminal.cpp
@@ -26,7 +26,8 @@
 #include "unistd.h"
 #include <assert.h>
 
-OctaveTerminal::OctaveTerminal (QWidget * parent):QWidget (parent)
+OctaveTerminal::OctaveTerminal (QWidget * parent)
+  : QPlainTextEdit (parent)
 {
   construct ();
 }
@@ -38,19 +39,23 @@
 void
 OctaveTerminal::construct ()
 {
-  m_terminalWidget = new QTerminalWidget (0, this);
-  m_terminalWidget->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
-  setFocusProxy (m_terminalWidget);
-
-  QVBoxLayout *layout = new QVBoxLayout ();
-  layout->addWidget (m_terminalWidget);
-  layout->setMargin (3);
-  setLayout (layout);
+  setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
 }
 
 void
 OctaveTerminal::openTerminal ()
 {
+  m_session = new Session ();
+  m_session->setTitle (Session::NameRole, "QTerminalWidget");
+  m_session->setProgram ("/bin/bash");
+  m_session->setArguments (QStringList ());
+  m_session->setAutoClose (true);
+  m_session->setCodec (QTextCodec::codecForName ("UTF-8"));
+  m_session->setFlowControlEnabled (true);
+  m_session->setDarkBackground (true);
+
+  connect (m_session, SIGNAL(receivedData(QString)), this, SLOT(appendPlainText(QString)));
+
   int fdm, fds;
   if (openpty (&fdm, &fds, 0, 0, 0) < 0)
     {
@@ -60,5 +65,152 @@
   dup2 (fds, 1);
   dup2 (fds, 2);
 
-  m_terminalWidget->openTeletype (fdm);
+  m_session->openTeletype (fdm);
 }
+
+void
+OctaveTerminal::keyPressEvent (QKeyEvent * keyEvent)
+{
+  //QByteArray textToSend;
+
+  //textToSend += QString::fromUtf8());
+  m_session->sendText(keyEvent->text ());
+  keyEvent->accept ();
+
+  /*
+  bool emitKeyPressSignal = true;
+
+  if (event->modifiers () == Qt::ControlModifier)
+    {
+      switch (event->key ())
+    {
+    case Qt::Key_C:
+      copyClipboard ();
+      break;
+    case Qt::Key_V:
+      pasteClipboard ();
+      break;
+    };
+    }
+  else if (event->modifiers () == Qt::ShiftModifier)
+    {
+      bool update = true;
+
+      if (event->key () == Qt::Key_PageUp)
+    {
+      _screenWindow->scrollBy (ScreenWindow::ScrollPages, -1);
+    }
+      else if (event->key () == Qt::Key_PageDown)
+    {
+      _screenWindow->scrollBy (ScreenWindow::ScrollPages, 1);
+    }
+      else if (event->key () == Qt::Key_Up)
+    {
+      _screenWindow->scrollBy (ScreenWindow::ScrollLines, -1);
+    }
+      else if (event->key () == Qt::Key_Down)
+    {
+      _screenWindow->scrollBy (ScreenWindow::ScrollLines, 1);
+    }
+      else
+    update = false;
+
+    }
+
+  _actSel = 0;          // Key stroke implies a screen update, so TerminalDisplay won't
+  // know where the current selection is.
+
+  if (_hasBlinkingCursor)
+    {
+      _blinkCursorTimer->start (QApplication::cursorFlashTime () / 2);
+      if (_cursorBlinking)
+    blinkCursorEvent ();
+      else
+    _cursorBlinking = false;
+    }
+
+  if (emitKeyPressSignal)
+    emit keyPressedSignal (event);
+
+  event->accept ();
+  _scrollBar->setValue (_scrollBar->maximum ());
+  Qt::KeyboardModifiers modifiers = keyEvent->modifiers ();
+  KeyboardTranslator::States states = KeyboardTranslator::NoState;
+
+  // get current states
+  if (getMode (MODE_NewLine))
+    states |= KeyboardTranslator::NewLineState;
+  if (getMode (MODE_Ansi))
+    states |= KeyboardTranslator::AnsiState;
+  if (getMode (MODE_AppCuKeys))
+    states |= KeyboardTranslator::CursorKeysState;
+  if (getMode (MODE_AppScreen))
+    states |= KeyboardTranslator::AlternateScreenState;
+  if (getMode (MODE_AppKeyPad) && (modifiers & Qt::KeypadModifier))
+    states |= KeyboardTranslator::ApplicationKeypadState;
+
+  // check flow control state
+  if (modifiers & Qt::ControlModifier)
+    {
+      if (event->key () == Qt::Key_S)
+    emit flowControlKeyPressed (true);
+      else
+    if (event->key () == Qt::Key_Q)
+      emit flowControlKeyPressed (false);
+    }
+
+  // lookup key binding
+  if (_keyTranslator)
+    {
+      KeyboardTranslator::Entry entry =
+    _keyTranslator->findEntry (event->key (), modifiers, states);
+
+      // send result to terminal
+      QByteArray textToSend;
+
+      // special handling for the Alt (aka. Meta) modifier.  pressing
+      // Alt+[Character] results in Esc+[Character] being sent
+      // (unless there is an entry defined for this particular combination
+      //  in the keyboard modifier)
+      bool wantsAltModifier =
+    entry.modifiers () & entry.modifierMask () & Qt::AltModifier;
+      bool wantsAnyModifier =
+    entry.state () & entry.
+    stateMask () & KeyboardTranslator::AnyModifierState;
+
+      if (modifiers & Qt::AltModifier
+      && !(wantsAltModifier || wantsAnyModifier)
+      && !event->text ().isEmpty ())
+    {
+      textToSend.prepend ("\033");
+    }
+
+      if (entry.command () != KeyboardTranslator::NoCommand)
+    {
+      if (entry.command () & KeyboardTranslator::EraseCommand)
+        textToSend += eraseChar ();
+
+      // TODO command handling
+    }
+      else if (!entry.text ().isEmpty ())
+    {
+      textToSend += _codec->fromUnicode (entry.text (true, modifiers));
+    }
+      else
+    textToSend += _codec->fromUnicode (event->text ());
+
+      sendData (textToSend.constData (), textToSend.length ());
+    }
+  else
+    {
+      // print an error message to the terminal if no key translator has been
+      // set
+      QString translatorError = QString ("No keyboard translator available.  "
+                     "The information needed to convert key presses "
+                     "into characters to send to the terminal "
+                     "is missing.");
+      reset ();
+      receiveData (translatorError.toAscii ().constData (),
+           translatorError.count ());
+    }*/
+}

--- a/gui/src/OctaveTerminal.h
+++ b/gui/src/OctaveTerminal.h
@@ -18,20 +18,24 @@
 
 #ifndef OCTAVETERMINAL_H
 #define OCTAVETERMINAL_H
-#include <QWidget>
-#include "QTerminalWidget.h"
+#include <QPlainTextEdit>
+#include "Session.h"
 
-class OctaveTerminal:public QWidget
+class OctaveTerminal:public QPlainTextEdit
 {
 Q_OBJECT
 public:
   OctaveTerminal (QWidget * parent = 0);
   ~OctaveTerminal ();
 
-  void sendText (QString text) { m_terminalWidget->sendText(text); }
+  void sendText (QString text) { m_session->sendText (text); }
   void openTerminal ();
+
+protected:
+  void keyPressEvent (QKeyEvent *keyEvent);
+
 private:
   void construct ();
-  QTerminalWidget *m_terminalWidget;
+  Session *m_session;
 };
 #endif // OCTAVETERMINAL_H

--- a/gui/src/terminal/CharacterColor.h
+++ b/gui/src/terminal/CharacterColor.h
@@ -117,7 +117,7 @@
 //a standard set of colors using black text on a white background.
 //defined in TerminalDisplay.cpp
 
-extern const ColorEntry base_color_table[TABLE_COLORS];
+//extern const ColorEntry base_color_table[TABLE_COLORS];
 
 /* CharacterColor is a union of the various color spaces.
 

deleted file mode 100644
--- a/gui/src/terminal/Emulation.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
-    Copyright 2007-2008 Robert Knight <robertknight@gmail.com> 
-    Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
-    Copyright 1996 by Matthias Ettrich <ettrich@kde.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA.
-*/
-
-// Own
-#include "Emulation.h"
-
-// System
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-// Qt
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QHash>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QRegExp>
-#include <QtCore/QTextStream>
-#include <QtCore/QThread>
-
-#include <QtCore/QTime>
-
-// Konsole
-#include "KeyboardTranslator.h"
-#include "Screen.h"
-#include "TerminalCharacterDecoder.h"
-#include "ScreenWindow.h"
-
-Emulation::Emulation ():
-_currentScreen (0),
-_codec (0), _decoder (0), _keyTranslator (0), _usesMouse (false)
-{
-  // create screens with a default size
-  _screen[0] = new Screen (40, 80);
-  _screen[1] = new Screen (40, 80);
-  _currentScreen = _screen[0];
-
-  QObject::connect (&_bulkTimer1, SIGNAL (timeout ()), this,
-		    SLOT (showBulk ()));
-  QObject::connect (&_bulkTimer2, SIGNAL (timeout ()), this,
-		    SLOT (showBulk ()));
-
-  // listen for mouse status changes
-  connect (this, SIGNAL (programUsesMouseChanged (bool)),
-	   SLOT (usesMouseChanged (bool)));
-}
-
-bool
-Emulation::programUsesMouse () const
-{
-  return _usesMouse;
-}
-
-void
-Emulation::usesMouseChanged (bool usesMouse)
-{
-  _usesMouse = usesMouse;
-}
-
-ScreenWindow *
-Emulation::createWindow ()
-{
-  ScreenWindow *window = new ScreenWindow ();
-  window->setScreen (_currentScreen);
-  _windows << window;
-
-  connect (window, SIGNAL (selectionChanged ()),
-	   this, SLOT (bufferedUpdate ()));
-
-  connect (this, SIGNAL (outputChanged ()),
-	   window, SLOT (notifyOutputChanged ()));
-  return window;
-}
-
-Emulation::~Emulation ()
-{
-  QListIterator < ScreenWindow * >windowIter (_windows);
-
-  while (windowIter.hasNext ())
-    {
-      delete windowIter.next ();
-    }
-
-  delete _screen[0];
-  delete _screen[1];
-  delete _decoder;
-}
-
-void
-Emulation::setScreen (int n)
-{
-  Screen *old = _currentScreen;
-  _currentScreen = _screen[n & 1];
-  if (_currentScreen != old)
-    {
-      // tell all windows onto this emulation to switch to the newly active screen
-      foreach (ScreenWindow * window, _windows)
-	window->setScreen (_currentScreen);
-    }
-}
-
-void
-Emulation::clearHistory ()
-{
-  _screen[0]->setScroll (_screen[0]->getScroll (), false);
-}
-
-void
-Emulation::setHistory (const HistoryType & t)
-{
-  _screen[0]->setScroll (t);
-
-  showBulk ();
-}
-
-const HistoryType &
-Emulation::history () const
-{
-  return _screen[0]->getScroll ();
-}
-
-void
-Emulation::setCodec (const QTextCodec * qtc)
-{
-  if (qtc)
-    _codec = qtc;
-  else
-    setCodec (LocaleCodec);
-
-  delete _decoder;
-  _decoder = _codec->makeDecoder ();
-
-  emit useUtf8Request (utf8 ());
-}
-
-void
-Emulation::setCodec (EmulationCodec codec)
-{
-  if (codec == Utf8Codec)
-    setCodec (QTextCodec::codecForName ("utf8"));
-  else if (codec == LocaleCodec)
-    setCodec (QTextCodec::codecForLocale ());
-}
-
-void
-Emulation::setKeyBindings (const QString & name)
-{
-  _keyTranslator =
-    KeyboardTranslatorManager::instance ()->findTranslator (name);
-  if (!_keyTranslator)
-    {
-      _keyTranslator =
-	KeyboardTranslatorManager::instance ()->defaultTranslator ();
-    }
-}
-
-QString
-Emulation::keyBindings () const
-{
-  return _keyTranslator->name ();
-}
-
-void
-Emulation::receiveChar (int c)
-// process application unicode input to terminal
-// this is a trivial scanner
-{
-  c &= 0xff;
-  switch (c)
-    {
-    case '\b':
-      _currentScreen->backspace ();
-      break;
-    case '\t':
-      _currentScreen->tab ();
-      break;
-    case '\n':
-      _currentScreen->newLine ();
-      break;
-    case '\r':
-      _currentScreen->toStartOfLine ();
-      break;
-    case 0x07:
-      emit stateSet (NOTIFYBELL);
-      break;
-    default:
-      _currentScreen->displayCharacter (c);
-      break;
-    };
-}
-
-void
-Emulation::sendKeyEvent (QKeyEvent * ev)
-{
-  emit stateSet (NOTIFYNORMAL);
-
-  if (!ev->text ().isEmpty ())
-    {				// A block of text
-      // Note that the text is proper unicode.
-      // We should do a conversion here
-      emit sendData (ev->text ().toUtf8 (), ev->text ().length ());
-    }
-}
-
-void
-Emulation::sendString (const char *, int)
-{
-  // default implementation does nothing
-}
-
-void
-Emulation::sendMouseEvent (int /*buttons */ , int /*column */ , int /*row */ ,
-			   int /*eventType */ )
-{
-  // default implementation does nothing
-}
-
-/*
-   We are doing code conversion from locale to unicode first.
-TODO: Character composition from the old code.  See #96536
-*/
-
-void
-Emulation::receiveData (const char *text, int length)
-{
-  emit stateSet (NOTIFYACTIVITY);
-
-  bufferedUpdate ();
-
-  QString unicodeText = _decoder->toUnicode (text, length);
-
-  //send characters to terminal emulator
-  for (int i = 0; i < unicodeText.length (); i++)
-    receiveChar (unicodeText[i].unicode ());
-}
-
-void
-Emulation::writeToStream (TerminalCharacterDecoder * _decoder,
-			  int startLine, int endLine)
-{
-  _currentScreen->writeLinesToStream (_decoder, startLine, endLine);
-}
-
-int
-Emulation::lineCount () const
-{
-  // sum number of lines currently on _screen plus number of lines in history
-  return _currentScreen->getLines () + _currentScreen->getHistLines ();
-}
-
-#define BULK_TIMEOUT1 10
-#define BULK_TIMEOUT2 40
-
-void
-Emulation::showBulk ()
-{
-  _bulkTimer1.stop ();
-  _bulkTimer2.stop ();
-
-  emit outputChanged ();
-
-  _currentScreen->resetScrolledLines ();
-  _currentScreen->resetDroppedLines ();
-}
-
-void
-Emulation::bufferedUpdate ()
-{
-  _bulkTimer1.setSingleShot (true);
-  _bulkTimer1.start (BULK_TIMEOUT1);
-  if (!_bulkTimer2.isActive ())
-    {
-      _bulkTimer2.setSingleShot (true);
-      _bulkTimer2.start (BULK_TIMEOUT2);
-    }
-}
-
-char
-Emulation::eraseChar () const
-{
-  return '\b';
-}
-
-void
-Emulation::setImageSize (int lines, int columns)
-{
-  if ((lines < 1) || (columns < 1))
-    return;
-
-  QSize screenSize[2] = { QSize (_screen[0]->getColumns (),
-				 _screen[0]->getLines ()),
-    QSize (_screen[1]->getColumns (),
-	   _screen[1]->getLines ())
-  };
-  QSize newSize (columns, lines);
-
-  if (newSize == screenSize[0] && newSize == screenSize[1])
-    return;
-
-  _screen[0]->resizeImage (lines, columns);
-  _screen[1]->resizeImage (lines, columns);
-
-  emit imageSizeChanged (lines, columns);
-
-  bufferedUpdate ();
-}
-
-QSize
-Emulation::imageSize () const
-{
-  return QSize (_currentScreen->getColumns (), _currentScreen->getLines ());
-}
-
-ushort
-ExtendedCharTable::extendedCharHash (ushort * unicodePoints, ushort length) const
-{
-  ushort hash = 0;
-  for (ushort i = 0; i < length; i++)
-    {
-      hash = 31 * hash + unicodePoints[i];
-    }
-  return hash;
-}
-
-bool
-ExtendedCharTable::extendedCharMatch (ushort hash, ushort * unicodePoints,
-				      ushort length) const
-{
-  ushort *entry = extendedCharTable[hash];
-
-  // compare given length with stored sequence length ( given as the first ushort in the 
-  // stored buffer ) 
-  if (entry == 0 || entry[0] != length)
-    return false;
-  // if the lengths match, each character must be checked.  the stored buffer starts at
-  // entry[1]
-  for (int i = 0; i < length; i++)
-    {
-      if (entry[i + 1] != unicodePoints[i])
-	return false;
-    }
-  return true;
-}
-
-ushort
-ExtendedCharTable::createExtendedChar (ushort * unicodePoints, ushort length)
-{
-  // look for this sequence of points in the table
-  ushort hash = extendedCharHash (unicodePoints, length);
-
-  // check existing entry for match
-  while (extendedCharTable.contains (hash))
-    {
-      if (extendedCharMatch (hash, unicodePoints, length))
-	{
-	  // this sequence already has an entry in the table, 
-	  // return its hash
-	  return hash;
-	}
-      else
-	{
-	  // if hash is already used by another, different sequence of unicode character
-	  // points then try next hash
-	  hash++;
-	}
-    }
-
-
-  // add the new sequence to the table and
-  // return that index
-  ushort *buffer = new ushort[length + 1];
-  buffer[0] = length;
-  for (int i = 0; i < length; i++)
-    buffer[i + 1] = unicodePoints[i];
-
-  extendedCharTable.insert (hash, buffer);
-
-  return hash;
-}
-
-ushort *
-ExtendedCharTable::lookupExtendedChar (ushort hash, ushort & length) const
-{
-  // lookup index in table and if found, set the length
-  // argument and return a pointer to the character sequence
-
-  ushort *buffer = extendedCharTable[hash];
-  if (buffer)
-    {
-      length = buffer[0];
-      return buffer + 1;
-    }
-  else
-    {
-      length = 0;
-      return 0;
-    }
-}
-
-ExtendedCharTable::ExtendedCharTable ()
-{
-}
-
-ExtendedCharTable::~ExtendedCharTable ()
-{
-  // free all allocated character buffers
-  QHashIterator < ushort, ushort * >iter (extendedCharTable);
-  while (iter.hasNext ())
-    {
-      iter.next ();
-      delete[]iter.value ();
-    }
-}
-
-// global instance
-ExtendedCharTable
-  ExtendedCharTable::instance;

deleted file mode 100644
--- a/gui/src/terminal/Emulation.h
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-    This file is part of Konsole, an X terminal.
-    
-    Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
-    Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA.
-*/
-
-#ifndef EMULATION_H
-#define EMULATION_H
-
-// System
-#include <stdio.h>
-
-// Qt 
-#include <QtGui/QKeyEvent>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
-#include <QtCore/QTimer>
-
-
-class KeyboardTranslator;
-class HistoryType;
-class Screen;
-class ScreenWindow;
-class TerminalCharacterDecoder;
-
-/** 
- * This enum describes the available states which 
- * the terminal emulation may be set to.
- *
- * These are the values used by Emulation::stateChanged() 
- */
-enum
-{
-    /** The emulation is currently receiving user input. */
-  NOTIFYNORMAL = 0,
-    /** 
-     * The terminal program has triggered a bell event
-     * to get the user's attention.
-     */
-  NOTIFYBELL = 1,
-    /** 
-     * The emulation is currently receiving data from its 
-     * terminal input.
-     */
-  NOTIFYACTIVITY = 2,
-
-  // unused here? 
-  NOTIFYSILENCE = 3
-};
-
-/**
- * Base class for terminal emulation back-ends.
- *
- * The back-end is responsible for decoding an incoming character stream and 
- * producing an output image of characters.
- *
- * When input from the terminal is received, the receiveData() slot should be called with
- * the data which has arrived.  The emulation will process the data and update the 
- * screen image accordingly.  The codec used to decode the incoming character stream
- * into the unicode characters used internally can be specified using setCodec() 
- *
- * The size of the screen image can be specified by calling setImageSize() with the 
- * desired number of lines and columns.  When new lines are added, old content
- * is moved into a history store, which can be set by calling setHistory(). 
- *
- * The screen image can be accessed by creating a ScreenWindow onto this emulation 
- * by calling createWindow().  Screen windows provide access to a section of the 
- * output.  Each screen window covers the same number of lines and columns as the 
- * image size returned by imageSize().  The screen window can be moved up and down
- * and provides transparent access to both the current on-screen image and the 
- * previous output.  The screen windows emit an outputChanged signal
- * when the section of the image they are looking at changes.
- * Graphical views can then render the contents of a screen window, listening for notifications
- * of output changes from the screen window which they are associated with and updating 
- * accordingly. 
- *
- * The emulation also is also responsible for converting input from the connected views such
- * as keypresses and mouse activity into a character string which can be sent
- * to the terminal program.  Key presses can be processed by calling the sendKeyEvent() slot,
- * while mouse events can be processed using the sendMouseEvent() slot.  When the character
- * stream has been produced, the emulation will emit a sendData() signal with a pointer
- * to the character buffer.  This data should be fed to the standard input of the terminal
- * process.  The translation of key presses into an output character stream is performed
- * using a lookup in a set of key bindings which map key sequences to output
- * character sequences.  The name of the key bindings set used can be specified using
- * setKeyBindings()
- *
- * The emulation maintains certain state information which changes depending on the 
- * input received.  The emulation can be reset back to its starting state by calling 
- * reset().  
- *
- * The emulation also maintains an activity state, which specifies whether
- * terminal is currently active ( when data is received ), normal
- * ( when the terminal is idle or receiving user input ) or trying
- * to alert the user ( also known as a "Bell" event ).  The stateSet() signal
- * is emitted whenever the activity state is set.  This can be used to determine
- * how long the emulation has been active/idle for and also respond to
- * a 'bell' event in different ways.
- */
-class Emulation:public QObject
-{
-Q_OBJECT public:
-
-   /** Constructs a new terminal emulation */
-  Emulation ();
-  ~Emulation ();
-
-  /**
-   * Creates a new window onto the output from this emulation.  The contents
-   * of the window are then rendered by views which are set to use this window using the
-   * TerminalDisplay::setScreenWindow() method.
-   */
-  ScreenWindow *createWindow ();
-
-  /** Returns the size of the screen image which the emulation produces */
-  QSize imageSize () const;
-
-  /**
-   * Returns the total number of lines, including those stored in the history.
-   */
-  int lineCount () const;
-
-  /** 
-   * Sets the history store used by this emulation.  When new lines
-   * are added to the output, older lines at the top of the screen are transferred to a history
-   * store.   
-   *
-   * The number of lines which are kept and the storage location depend on the 
-   * type of store.
-   */
-  void setHistory (const HistoryType &);
-  /** Returns the history store used by this emulation.  See setHistory() */
-  const HistoryType & history () const;
-  /** Clears the history scroll. */
-  void clearHistory ();
-
-  /** 
-   * Copies the output history from @p startLine to @p endLine 
-   * into @p stream, using @p decoder to convert the terminal
-   * characters into text. 
-   *
-   * @param decoder A decoder which converts lines of terminal characters with 
-   * appearance attributes into output text.  PlainTextDecoder is the most commonly
-   * used decoder.
-   * @param startLine Index of first line to copy
-   * @param endLine Index of last line to copy
-   */
-  virtual void writeToStream (TerminalCharacterDecoder * decoder,
-			      int startLine, int endLine);
-
-  /** Returns the codec used to decode incoming characters.  See setCodec() */
-  const QTextCodec *codec () const
-  {
-    return _codec;
-  }
-  /** Sets the codec used to decode incoming characters.  */
-  void setCodec (const QTextCodec *);
-
-  /** 
-   * Convenience method.  
-   * Returns true if the current codec used to decode incoming
-   * characters is UTF-8
-   */
-  bool utf8 () const
-  {
-    Q_ASSERT (_codec);
-    return _codec->mibEnum () == 106;
-  }
-
-
-  /** TODO Document me */
-  virtual char eraseChar () const;
-
-  /** 
-   * Sets the key bindings used to key events
-   * ( received through sendKeyEvent() ) into character
-   * streams to send to the terminal.
-   */
-  void setKeyBindings (const QString & name);
-  /** 
-   * Returns the name of the emulation's current key bindings.
-   * See setKeyBindings()
-   */
-  QString keyBindings () const;
-
-  /** 
-   * Copies the current image into the history and clears the screen.
-   */
-  virtual void clearEntireScreen () = 0;
-
-  /** Resets the state of the terminal. */
-  virtual void reset () = 0;
-
-  /** 
-   * Returns true if the active terminal program wants
-   * mouse input events.
-   *
-   * The programUsesMouseChanged() signal is emitted when this
-   * changes.
-   */
-  bool programUsesMouse () const;
-
-  public slots:
-  /** Change the size of the emulation's image */
-    virtual void setImageSize (int lines, int columns);
-
-  /** 
-   * Interprets a sequence of characters and sends the result to the terminal.
-   * This is equivalent to calling sendKeyEvent() for each character in @p text in succession.
-   */
-  virtual void sendText (const QString & text) = 0;
-
-  /** 
-   * Interprets a key press event and emits the sendData() signal with
-   * the resulting character stream. 
-   */
-  virtual void sendKeyEvent (QKeyEvent *);
-
-  /** 
-   * Converts information about a mouse event into an xterm-compatible escape
-   * sequence and emits the character sequence via sendData()
-   */
-  virtual void sendMouseEvent (int buttons, int column, int line,
-			       int eventType);
-
-  /**
-   * Sends a string of characters to the foreground terminal process. 
-   *
-   * @param string The characters to send.  
-   * @param length Length of @p string or if set to a negative value, @p string will
-   * be treated as a null-terminated string and its length will be determined automatically.
-   */
-  virtual void sendString (const char *string, int length = -1) = 0;
-
-  /** 
-   * Processes an incoming stream of characters.  receiveData() decodes the incoming
-   * character buffer using the current codec(), and then calls receiveChar() for
-   * each unicode character in the resulting buffer.  
-   *
-   * receiveData() also starts a timer which causes the outputChanged() signal
-   * to be emitted when it expires.  The timer allows multiple updates in quick
-   * succession to be buffered into a single outputChanged() signal emission.
-   *
-   * @param buffer A string of characters received from the terminal program.
-   * @param len The length of @p buffer
-   */
-  void receiveData (const char *buffer, int len);
-
-    signals:
-  /** 
-   * Emitted when a buffer of data is ready to send to the 
-   * standard input of the terminal.
-   *
-   * @param data The buffer of data ready to be sent
-   * @param len The length of @p data in bytes
-   */
-  void sendData (const char *data, int len);
-
-  /** 
-   * Requests that sending of input to the emulation
-   * from the terminal process be suspended or resumed.
-   *
-   * @param suspend If true, requests that sending of 
-   * input from the terminal process' stdout be 
-   * suspended.  Otherwise requests that sending of
-   * input be resumed. 
-   */
-  void lockPtyRequest (bool suspend);
-
-  /**
-   * Requests that the pty used by the terminal process
-   * be set to UTF 8 mode.  
-   *
-   * TODO: More documentation
-   */
-  void useUtf8Request (bool);
-
-  /**
-   * Emitted when the activity state of the emulation is set.
-   *
-   * @param state The new activity state, one of NOTIFYNORMAL, NOTIFYACTIVITY
-   * or NOTIFYBELL
-   */
-  void stateSet (int state);
-
-  /**
-   * Requests that the color of the text used
-   * to represent the tabs associated with this
-   * emulation be changed.  This is a Konsole-specific
-   * extension from pre-KDE 4 times.
-   *
-   * TODO: Document how the parameter works.
-   */
-  void changeTabTextColorRequest (int color);
-
-  /** 
-   * This is emitted when the program running in the shell indicates whether or
-   * not it is interested in mouse events.
-   *
-   * @param usesMouse This will be true if the program wants to be informed about
-   * mouse events or false otherwise.
-   */
-  void programUsesMouseChanged (bool usesMouse);
-
-  /** 
-   * Emitted when the contents of the screen image change.
-   * The emulation buffers the updates from successive image changes,
-   * and only emits outputChanged() at sensible intervals when
-   * there is a lot of terminal activity.
-   *
-   * Normally there is no need for objects other than the screen windows
-   * created with createWindow() to listen for this signal.
-   *
-   * ScreenWindow objects created using createWindow() will emit their
-   * own outputChanged() signal in response to this signal. 
-   */
-  void outputChanged ();
-
-  /**
-   * Emitted when the program running in the terminal wishes to update the 
-   * session's title.  This also allows terminal programs to customize other
-   * aspects of the terminal emulation display. 
-   *
-   * This signal is emitted when the escape sequence "\033]ARG;VALUE\007"
-   * is received in the input string, where ARG is a number specifying what
-   * should change and VALUE is a string specifying the new value.
-   *
-   * TODO:  The name of this method is not very accurate since this method
-   * is used to perform a whole range of tasks besides just setting
-   * the user-title of the session.    
-   *
-   * @param title Specifies what to change.
-   * <ul>
-   * <li>0 - Set window icon text and session title to @p newTitle</li>
-   * <li>1 - Set window icon text to @p newTitle</li>
-   * <li>2 - Set session title to @p newTitle</li>
-   * <li>11 - Set the session's default background color to @p newTitle,
-   *         where @p newTitle can be an HTML-style string ("#RRGGBB") or a named
-   *         color (eg 'red', 'blue').  
-   *         See http://doc.trolltech.com/4.2/qcolor.html#setNamedColor for more
-   *         details.
-   * </li>
-   * <li>31 - Supposedly treats @p newTitle as a URL and opens it (NOT IMPLEMENTED)</li>
-   * <li>32 - Sets the icon associated with the session.  @p newTitle is the name 
-   *    of the icon to use, which can be the name of any icon in the current KDE icon
-   *    theme (eg: 'konsole', 'kate', 'folder_home')</li>
-   * </ul>
-   * @param newTitle Specifies the new title 
-   */
-
-  void titleChanged (int title, const QString & newTitle);
-
-  /**
-   * Emitted when the program running in the terminal changes the
-   * screen size.
-   */
-  void imageSizeChanged (int lineCount, int columnCount);
-
-  /** 
-   * Emitted when the terminal program requests to change various properties
-   * of the terminal display.  
-   *
-   * A profile change command occurs when a special escape sequence, followed
-   * by a string containing a series of name and value pairs is received.
-   * This string can be parsed using a ProfileCommandParser instance.
-   *
-   * @param text A string expected to contain a series of key and value pairs in
-   * the form:  name=value;name2=value2 ...
-   */
-  void profileChangeCommandReceived (const QString & text);
-
-  /** 
-   * Emitted when a flow control key combination ( Ctrl+S or Ctrl+Q ) is pressed.
-   * @param suspendKeyPressed True if Ctrl+S was pressed to suspend output or Ctrl+Q to
-   * resume output.
-   */
-  void flowControlKeyPressed (bool suspendKeyPressed);
-
-protected:
-    virtual void setMode (int mode) = 0;
-  virtual void resetMode (int mode) = 0;
-
-  /** 
-   * Processes an incoming character.  See receiveData()
-   * @p ch A unicode character code. 
-   */
-  virtual void receiveChar (int ch);
-
-  /** 
-   * Sets the active screen.  The terminal has two screens, primary and alternate.
-   * The primary screen is used by default.  When certain interactive programs such
-   * as Vim are run, they trigger a switch to the alternate screen.
-   *
-   * @param index 0 to switch to the primary screen, or 1 to switch to the alternate screen
-   */
-  void setScreen (int index);
-
-  enum EmulationCodec
-  {
-    LocaleCodec = 0,
-    Utf8Codec = 1
-  };
-  void setCodec (EmulationCodec codec);	// codec number, 0 = locale, 1=utf8
-
-
-    QList < ScreenWindow * >_windows;
-
-  Screen *_currentScreen;	// pointer to the screen which is currently active, 
-  // this is one of the elements in the screen[] array
-
-  Screen *_screen[2];		// 0 = primary screen ( used by most programs, including the shell
-  //                      scrollbars are enabled in this mode )
-  // 1 = alternate      ( used by vi , emacs etc.
-  //                      scrollbars are not enabled in this mode )
-
-
-  //decodes an incoming C-style character stream into a unicode QString using 
-  //the current text codec.  (this allows for rendering of non-ASCII characters in text files etc.)
-  const QTextCodec *_codec;
-  QTextDecoder *_decoder;
-  const KeyboardTranslator *_keyTranslator;	// the keyboard layout
-
-  protected slots:
-  /** 
-   * Schedules an update of attached views.
-   * Repeated calls to bufferedUpdate() in close succession will result in only a single update,
-   * much like the Qt buffered update of widgets. 
-   */
-  void bufferedUpdate ();
-
-  private slots:
-    // triggered by timer, causes the emulation to send an updated screen image to each
-    // view
-  void showBulk ();
-
-  void usesMouseChanged (bool usesMouse);
-
-private:
-    bool _usesMouse;
-  QTimer _bulkTimer1;
-  QTimer _bulkTimer2;
-
-};
-
-#endif // ifndef EMULATION_H

deleted file mode 100644
--- a/gui/src/terminal/Filter.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
-    Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA.
-*/
-
-// Own
-#include "Filter.h"
-
-// System
-#include <iostream>
-
-// Qt
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QSharedData>
-#include <QtCore/QFile>
-
-// Konsole
-#include "TerminalCharacterDecoder.h"
-#include "konsole_wcwidth.h"
-#include "konsole_export.h"
-
-FilterChain::~FilterChain ()
-{
-  QMutableListIterator < Filter * >iter (*this);
-
-  while (iter.hasNext ())
-    {
-      Filter *filter = iter.next ();
-      iter.remove ();
-      delete filter;
-    }
-}
-
-void
-FilterChain::addFilter (Filter * filter)
-{
-  append (filter);
-}
-
-void
-FilterChain::removeFilter (Filter * filter)
-{
-  removeAll (filter);
-}
-
-bool
-FilterChain::containsFilter (Filter * filter)
-{
-  return contains (filter);
-}
-
-void
-FilterChain::reset ()
-{
-  QListIterator < Filter * >iter (*this);
-  while (iter.hasNext ())
-    iter.next ()->reset ();
-}
-
-void
-FilterChain::setBuffer (const QString * buffer,
-			const QList < int >*linePositions)
-{
-  QListIterator < Filter * >iter (*this);
-  while (iter.hasNext ())
-    iter.next ()->setBuffer (buffer, linePositions);
-}
-
-void
-FilterChain::process ()
-{
-  QListIterator < Filter * >iter (*this);
-  while (iter.hasNext ())
-    iter.next ()->process ();
-}
-
-void
-FilterChain::clear ()
-{
-  QList < Filter * >::clear ();
-}
-
-Filter::HotSpot * FilterChain::hotSpotAt (int line, int column) const
-{
-  QListIterator < Filter * >iter (*this);
-  while (iter.hasNext ())
-    {
-      Filter *
-	filter = iter.next ();
-      Filter::HotSpot * spot = filter->hotSpotAt (line, column);
-      if (spot != 0)
-	{
-	  return spot;
-	}
-    }
-
-  return 0;
-}
-
-QList < Filter::HotSpot * >FilterChain::hotSpots () const
-{
-  QList < Filter::HotSpot * >list;
-  QListIterator < Filter * >iter (*this);
-  while (iter.hasNext ())
-    {
-      Filter *
-	filter = iter.next ();
-      list << filter->hotSpots ();
-    }
-  return list;
-}
-
-//QList<Filter::HotSpot*> FilterChain::hotSpotsAtLine(int line) const;
-
-TerminalImageFilterChain::TerminalImageFilterChain ():_buffer (0),
-_linePositions (0)
-{
-}
-
-TerminalImageFilterChain::~TerminalImageFilterChain ()
-{
-  delete _buffer;
-  delete _linePositions;
-}
-
-void
-TerminalImageFilterChain::setImage (const Character * const image, int lines,
-				    int columns,
-				    const QVector < LineProperty >
-				    &lineProperties)
-{
-  if (empty ())
-    return;
-
-  // reset all filters and hotspots
-  reset ();
-
-  PlainTextDecoder decoder;
-  decoder.setTrailingWhitespace (false);
-
-  // setup new shared buffers for the filters to process on
-  QString *newBuffer = new QString ();
-  QList < int >*newLinePositions = new QList < int >();
-  setBuffer (newBuffer, newLinePositions);
-
-  // free the old buffers
-  delete _buffer;
-  delete _linePositions;
-
-  _buffer = newBuffer;
-  _linePositions = newLinePositions;
-
-  QTextStream lineStream (_buffer);
-  decoder.begin (&lineStream);
-
-  for (int i = 0; i < lines; i++)
-    {
-      _linePositions->append (_buffer->length ());
-      decoder.decodeLine (image + i * columns, columns, LINE_DEFAULT);
-
-      // pretend that each line ends with a newline character.
-      // this prevents a link that occurs at the end of one line
-      // being treated as part of a link that occurs at the start of the next line
-      //
-      // the downside is that links which are spread over more than one line are not
-      // highlighted.  
-      //
-      // TODO - Use the "line wrapped" attribute associated with lines in a
-      // terminal image to avoid adding this imaginary character for wrapped
-      // lines
-      if (!(lineProperties.value (i, LINE_DEFAULT) & LINE_WRAPPED))
-	lineStream << QChar ('\n');
-    }
-  decoder.end ();
-}
-
-Filter::Filter ():
-_linePositions (0), _buffer (0)
-{
-}
-
-Filter::~Filter ()
-{
-  QListIterator < HotSpot * >iter (_hotspotList);
-  while (iter.hasNext ())
-    {
-      delete iter.next ();
-    }
-}
-
-void
-Filter::reset ()
-{
-  _hotspots.clear ();
-  _hotspotList.clear ();
-}
-
-void
-Filter::setBuffer (const QString * buffer, const QList < int >*linePositions)
-{
-  _buffer = buffer;
-  _linePositions = linePositions;
-}
-
-void
-Filter::getLineColumn (int position, int &startLine, int &startColumn)
-{
-  Q_ASSERT (_linePositions);
-  Q_ASSERT (_buffer);
-
-
-  for (int i = 0; i < _linePositions->count (); i++)
-    {
-      int nextLine = 0;
-
-      if (i == _linePositions->count () - 1)
-	nextLine = _buffer->length () + 1;
-      else
-	nextLine = _linePositions->value (i + 1);
-
-      if (_linePositions->value (i) <= position && position < nextLine)
-	{
-	  startLine = i;
-	  startColumn =
-	    string_width (buffer ()->
-			  mid (_linePositions->value (i),
-			       position - _linePositions->value (i)));
-	  return;
-	}
-    }
-}
-
-
-/*void Filter::addLine(const QString& text)
-{
-    _linePositions << _buffer.length();
-    _buffer.append(text);
-}*/
-
-const QString *
-Filter::buffer ()
-{
-  return _buffer;
-}
-
-Filter::HotSpot::~HotSpot ()
-{
-}
-
-void
-Filter::addHotSpot (HotSpot * spot)
-{
-  _hotspotList << spot;
-
-  for (int line = spot->startLine (); line <= spot->endLine (); line++)
-    {
-      _hotspots.insert (line, spot);
-    }
-}
-
-QList < Filter::HotSpot * >Filter::hotSpots () const
-{
-  return _hotspotList;
-}
-
-QList < Filter::HotSpot * >Filter::hotSpotsAtLine (int line) const
-{
-  return _hotspots.values (line);
-}
-
-Filter::HotSpot * Filter::hotSpotAt (int line, int column) const
-{
-  QListIterator < HotSpot * >spotIter (_hotspots.values (line));
-
-  while (spotIter.hasNext ())
-    {
-      HotSpot *
-	spot = spotIter.next ();
-
-      if (spot->startLine () == line && spot->startColumn () > column)
-	continue;
-      if (spot->endLine () == line && spot->endColumn () < column)
-	continue;
-
-      return spot;
-    }
-
-  return 0;
-}
-
-Filter::HotSpot::HotSpot (int startLine, int startColumn, int endLine, int endColumn):_startLine (startLine), _startColumn (startColumn), _endLine (endLine),
-_endColumn (endColumn),
-_type (NotSpecified)
-{
-}
-
-QString
-Filter::HotSpot::tooltip () const
-{
-  return QString ();
-}
-
-QList < QAction * >Filter::HotSpot::actions ()
-{
-  return QList < QAction * >();
-}
-
-int
-Filter::HotSpot::startLine () const
-{
-  return _startLine;
-}
-
-int
-Filter::HotSpot::endLine () const
-{
-  return _endLine;
-}
-
-int
-Filter::HotSpot::startColumn () const
-{
-  return _startColumn;
-}
-
-int
-Filter::HotSpot::endColumn () const
-{
-  return _endColumn;
-}
-
-Filter::HotSpot::Type Filter::HotSpot::type () const
-{
-  return _type;
-}
-
-void
-Filter::HotSpot::setType (Type type)
-{
-  _type = type;
-}
-
-RegExpFilter::RegExpFilter ()
-{
-}
-
-RegExpFilter::HotSpot::HotSpot (int startLine, int startColumn, int endLine,
-				int endColumn):
-Filter::HotSpot (startLine, startColumn, endLine, endColumn)
-{
-  setType (Marker);
-}
-
-void
-RegExpFilter::HotSpot::activate (QObject *)
-{
-}
-
-void
-RegExpFilter::HotSpot::setCapturedTexts (const QStringList & texts)
-{
-  _capturedTexts = texts;
-}
-
-QStringList
-RegExpFilter::HotSpot::capturedTexts () const
-{
-  return _capturedTexts;
-}
-
-void
-RegExpFilter::setRegExp (const QRegExp & regExp)
-{
-  _searchText = regExp;
-}
-
-QRegExp
-RegExpFilter::regExp () const
-{
-  return _searchText;
-}
-
-/*void RegExpFilter::reset(int)
-{
-    _buffer = QString();
-}*/
-void
-RegExpFilter::process ()
-{
-  int pos = 0;
-  const QString *text = buffer ();
-
-  Q_ASSERT (text);
-
-  // ignore any regular expressions which match an empty string.
-  // otherwise the while loop below will run indefinitely
-  static const QString emptyString ("");
-  if (_searchText.exactMatch (emptyString))
-    return;
-
-  while (pos >= 0)
-    {
-      pos = _searchText.indexIn (*text, pos);
-
-      if (pos >= 0)
-	{
-	  int startLine = 0;
-	  int endLine = 0;
-	  int startColumn = 0;
-	  int endColumn = 0;
-
-	  getLineColumn (pos, startLine, startColumn);
-	  getLineColumn (pos + _searchText.matchedLength (), endLine,
-			 endColumn);
-
-	  RegExpFilter::HotSpot * spot = newHotSpot (startLine, startColumn,
-						     endLine, endColumn);
-	  spot->setCapturedTexts (_searchText.capturedTexts ());
-
-	  addHotSpot (spot);
-	  pos += _searchText.matchedLength ();
-
-	  // if matchedLength == 0, the program will get stuck in an infinite loop
-	  if (_searchText.matchedLength () == 0)
-	    pos = -1;
-	}
-    }
-}
-
-RegExpFilter::HotSpot * RegExpFilter::newHotSpot (int startLine,
-						  int startColumn,
-						  int endLine, int endColumn)
-{
-  return new RegExpFilter::HotSpot (startLine, startColumn,
-				    endLine, endColumn);
-}
-
-RegExpFilter::HotSpot * UrlFilter::newHotSpot (int startLine, int startColumn,
-					       int endLine, int endColumn)
-{
-  return new UrlFilter::HotSpot (startLine, startColumn, endLine, endColumn);
-}
-
-UrlFilter::HotSpot::HotSpot (int startLine, int startColumn, int endLine, int endColumn):RegExpFilter::HotSpot (startLine, startColumn, endLine, endColumn),
-_urlObject (new
-	    FilterObject (this))
-{
-  setType (Link);
-}
-
-QString
-UrlFilter::HotSpot::tooltip () const
-{
-  QString
-    url = capturedTexts ().first ();
-
-  const UrlType
-    kind = urlType ();
-
-  if (kind == StandardUrl)
-    return QString ();
-  else if (kind == Email)
-    return QString ();
-  else
-    return QString ();
-}
-
-UrlFilter::HotSpot::UrlType UrlFilter::HotSpot::urlType () const
-{
-  QString
-    url = capturedTexts ().first ();
-
-  if (FullUrlRegExp.exactMatch (url))
-    return StandardUrl;
-  else if (EmailAddressRegExp.exactMatch (url))
-    return Email;
-  else
-    return Unknown;
-}
-
-void
-UrlFilter::HotSpot::activate (QObject * object)
-{
-  QString
-    url = capturedTexts ().first ();
-
-  const UrlType
-    kind = urlType ();
-
-  const
-    QString &
-    actionName = object ? object->objectName () : QString ();
-
-  if (actionName == "copy-action")
-    {
-      QApplication::clipboard ()->setText (url);
-      return;
-    }
-
-  if (!object || actionName == "open-action")
-    {
-      if (kind == StandardUrl)
-	{
-	  // if the URL path does not include the protocol ( eg. "www.kde.org" ) then
-	  // prepend http:// ( eg. "www.kde.org" --> "http://www.kde.org" )
-	  if (!url.contains ("://"))
-	    {
-	      url.prepend ("http://");
-	    }
-	}
-      else if (kind == Email)
-	{
-	  url.prepend ("mailto:");
-	}
-
-      //new KRun(url,QApplication::activeWindow());
-    }
-}
-
-// Note:  Altering these regular expressions can have a major effect on the performance of the filters 
-// used for finding URLs in the text, especially if they are very general and could match very long
-// pieces of text.
-// Please be careful when altering them.
-
-//regexp matches:
-// full url:  
-// protocolname:// or www. followed by anything other than whitespaces, <, >, ' or ", and ends before whitespaces, <, >, ', ", ], !, comma and dot
-const QRegExp
-UrlFilter::
-
-FullUrlRegExp
-("(www\\.(?!\\.)|[a-z][a-z0-9+.-]*://)[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]]");
-// email address:
-// [word chars, dots or dashes]@[word chars, dots or dashes].[word chars]
-const QRegExp
-UrlFilter::EmailAddressRegExp ("\\b(\\w|\\.|-)+@(\\w|\\.|-)+\\.\\w+\\b");
-
-// matches full url or email address
-const QRegExp
-UrlFilter::CompleteUrlRegExp ('(' + FullUrlRegExp.pattern () + '|' +
-			      EmailAddressRegExp.pattern () + ')');
-
-UrlFilter::UrlFilter ()
-{
-  setRegExp (CompleteUrlRegExp);
-}
-
-UrlFilter::HotSpot::~HotSpot ()
-{
-  delete
-    _urlObject;
-}
-
-void
-FilterObject::activated ()
-{
-  _filter->activate (sender ());
-}
-
-QList < QAction * >UrlFilter::HotSpot::actions ()
-{
-  QList < QAction * >list;
-
-  const UrlType
-    kind = urlType ();
-
-  QAction *
-    openAction = new QAction (_urlObject);
-  QAction *
-    copyAction = new QAction (_urlObject);;
-
-  Q_ASSERT (kind == StandardUrl || kind == Email);
-
-  if (kind == StandardUrl)
-    {
-      openAction->setText (tr ((char *) "Open Link"));
-      copyAction->setText (tr ((char *) "Copy Link Address"));
-    }
-  else if (kind == Email)
-    {
-      openAction->setText (tr ((char *) "Send Email To..."));
-      copyAction->setText (tr ((char *) "Copy Email Address"));
-    }
-
-  // object names are set here so that the hotspot performs the
-  // correct action when activated() is called with the triggered
-  // action passed as a parameter.
-  openAction->setObjectName (QLatin1String ("open-action"));
-  copyAction->setObjectName (QLatin1String ("copy-action"));
-
-  QObject::connect (openAction, SIGNAL (triggered ()), _urlObject,
-		    SLOT (activated ()));
-  QObject::connect (copyAction, SIGNAL (triggered ()), _urlObject,
-		    SLOT (activated ()));
-
-  list << openAction;
-  list << copyAction;
-
-  return list;
-}

deleted file mode 100644
--- a/gui/src/terminal/Filter.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
-    Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA.
-*/
-
-#ifndef FILTER_H
-#define FILTER_H
-
-// Qt
-#include <QtGui/QAction>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QRegExp>
-
-// Local
-#include "Character.h"
-
-
-/**
- * A filter processes blocks of text looking for certain patterns (such as URLs or keywords from a list)
- * and marks the areas which match the filter's patterns as 'hotspots'.
- *
- * Each hotspot has a type identifier associated with it ( such as a link or a highlighted section ),
- * and an action.  When the user performs some activity such as a mouse-click in a hotspot area ( the exact
- * action will depend on what is displaying the block of text which the filter is processing ), the hotspot's
- * activate() method should be called.  Depending on the type of hotspot this will trigger a suitable response.
- *
- * For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser.
- * Hotspots may have more than one action, in which case the list of actions can be obtained using the 
- * actions() method.
- *
- * Different subclasses of filter will return different types of hotspot.
- * Subclasses must reimplement the process() method to examine a block of text and identify sections of interest.
- * When processing the text they should create instances of Filter::HotSpot subclasses for sections of interest
- * and add them to the filter's list of hotspots using addHotSpot()
- */
-class Filter
-{
-public:
-    /**
-    * Represents an area of text which matched the pattern a particular filter has been looking for.
-    *
-    * Each hotspot has a type identifier associated with it ( such as a link or a highlighted section ),
-    * and an action.  When the user performs some activity such as a mouse-click in a hotspot area ( the exact
-    * action will depend on what is displaying the block of text which the filter is processing ), the hotspot's
-    * activate() method should be called.  Depending on the type of hotspot this will trigger a suitable response.
-    *
-    * For example, if a hotspot represents a URL then a suitable action would be opening that URL in a web browser.
-    * Hotspots may have more than one action, in which case the list of actions can be obtained using the 
-    * actions() method.  These actions may then be displayed in a popup menu or toolbar for example. 
-    */
-  class HotSpot
-  {
-  public:
-       /** 
-        * Constructs a new hotspot which covers the area from (@p startLine,@p startColumn) to (@p endLine,@p endColumn)
-        * in a block of text.
-        */
-    HotSpot (int startLine, int startColumn, int endLine, int endColumn);
-    virtual ~ HotSpot ();
-
-    enum Type
-    {
-      // the type of the hotspot is not specified
-      NotSpecified,
-      // this hotspot represents a clickable link
-      Link,
-      // this hotspot represents a marker
-      Marker
-    };
-
-       /** Returns the line when the hotspot area starts */
-    int startLine () const;
-       /** Returns the line where the hotspot area ends */
-    int endLine () const;
-       /** Returns the column on startLine() where the hotspot area starts */
-    int startColumn () const;
-       /** Returns the column on endLine() where the hotspot area ends */
-    int endColumn () const;
-       /** 
-        * Returns the type of the hotspot.  This is usually used as a hint for views on how to represent
-        * the hotspot graphically.  eg.  Link hotspots are typically underlined when the user mouses over them
-        */
-    Type type () const;
-       /** 
-        * Causes the an action associated with a hotspot to be triggered. 
-        *
-        * @param object The object which caused the hotspot to be triggered.  This is
-        * typically null ( in which case the default action should be performed ) or
-        * one of the objects from the actions() list.  In which case the associated
-        * action should be performed. 
-        */
-    virtual void activate (QObject * object = 0) = 0;
-       /** 
-        * Returns a list of actions associated with the hotspot which can be used in a 
-        * menu or toolbar 
-        */
-    virtual QList < QAction * >actions ();
-
-       /** 
-        * Returns the text of a tooltip to be shown when the mouse moves over the hotspot, or
-        * an empty string if there is no tooltip associated with this hotspot.
-        *
-        * The default implementation returns an empty string. 
-        */
-    virtual QString tooltip () const;
-
-  protected:
-       /** Sets the type of a hotspot.  This should only be set once */
-    void setType (Type type);
-
-  private:
-    int _startLine;
-    int _startColumn;
-    int _endLine;
-    int _endColumn;
-    Type _type;
-
-  };
-
-    /** Constructs a new filter. */
-  Filter ();
-  virtual ~ Filter ();
-
-    /** Causes the filter to process the block of text currently in its internal buffer */
-  virtual void process () = 0;
-
-    /** 
-     * Empties the filters internal buffer and resets the line count back to 0.
-     * All hotspots are deleted. 
-     */
-  void reset ();
-
-    /** Adds a new line of text to the filter and increments the line count */
-  //void addLine(const QString& string);
-
-    /** Returns the hotspot which covers the given @p line and @p column, or 0 if no hotspot covers that area */
-  HotSpot *hotSpotAt (int line, int column) const;
-
-    /** Returns the list of hotspots identified by the filter */
-  QList < HotSpot * >hotSpots ()const;
-
-    /** Returns the list of hotspots identified by the filter which occur on a given line */
-  QList < HotSpot * >hotSpotsAtLine (int line) const;
-
-    /** 
-     * TODO: Document me
-     */
-  void setBuffer (const QString * buffer, const QList < int >*linePositions);
-
-protected:
-    /** Adds a new hotspot to the list */
-  void addHotSpot (HotSpot *);
-    /** Returns the internal buffer */
-  const QString *buffer ();
-    /** Converts a character position within buffer() to a line and column */
-  void getLineColumn (int position, int &startLine, int &startColumn);
-
-private:
-  QMultiHash < int, HotSpot * >_hotspots;
-  QList < HotSpot * >_hotspotList;
-
-  const QList < int >*_linePositions;
-  const QString *_buffer;
-};
-
-/** 
- * A filter which searches for sections of text matching a regular expression and creates a new RegExpFilter::HotSpot 
- * instance for them.
- *
- * Subclasses can reimplement newHotSpot() to return custom hotspot types when matches for the regular expression
- * are found. 
- */
-class RegExpFilter:public Filter
-{
-public:
-    /** 
-     * Type of hotspot created by RegExpFilter.  The capturedTexts() method can be used to find the text
-     * matched by the filter's regular expression.
-     */
-  class HotSpot:public Filter::HotSpot
-  {
-  public:
-    HotSpot (int startLine, int startColumn, int endLine, int endColumn);
-    virtual void activate (QObject * object = 0);
-
-	/** Sets the captured texts associated with this hotspot */
-    void setCapturedTexts (const QStringList & texts);
-	/** Returns the texts found by the filter when matching the filter's regular expression */
-    QStringList capturedTexts () const;
-  private:
-      QStringList _capturedTexts;
-  };
-
-    /** Constructs a new regular expression filter */
-  RegExpFilter ();
-
-    /** 
-     * Sets the regular expression which the filter searches for in blocks of text. 
-     *
-     * Regular expressions which match the empty string are treated as not matching
-     * anything. 
-     */
-  void setRegExp (const QRegExp & text);
-    /** Returns the regular expression which the filter searches for in blocks of text */
-  QRegExp regExp () const;
-
-    /** 
-     * Reimplemented to search the filter's text buffer for text matching regExp() 
-     *
-     * If regexp matches the empty string, then process() will return immediately
-     * without finding results. 
-     */
-  virtual void process ();
-
-protected:
-    /** 
-     * Called when a match for the regular expression is encountered.  Subclasses should reimplement this
-     * to return custom hotspot types
-     */
-  virtual RegExpFilter::HotSpot * newHotSpot (int startLine, int startColumn,
-					      int endLine, int endColumn);
-
-private:
-  QRegExp _searchText;
-};
-
-class FilterObject;
-
-/** A filter which matches URLs in blocks of text */
-class UrlFilter:public RegExpFilter
-{
-public:
-    /** 
-     * Hotspot type created by UrlFilter instances.  The activate() method opens a web browser 
-     * at the given URL when called.
-     */
-  class HotSpot:public RegExpFilter::HotSpot
-  {
-  public:
-    HotSpot (int startLine, int startColumn, int endLine, int endColumn);
-      virtual ~ HotSpot ();
-
-    virtual QList < QAction * >actions ();
-
-	/** 
-         * Open a web browser at the current URL.  The url itself can be determined using
-         * the capturedTexts() method.
-         */
-    virtual void activate (QObject * object = 0);
-
-    virtual QString tooltip () const;
-  private:
-    enum UrlType
-    {
-      StandardUrl,
-      Email,
-      Unknown
-    };
-    UrlType urlType () const;
-
-    FilterObject *_urlObject;
-  };
-
-  UrlFilter ();
-
-protected:
-  virtual RegExpFilter::HotSpot * newHotSpot (int, int, int, int);
-
-private:
-
-  static const QRegExp FullUrlRegExp;
-  static const QRegExp EmailAddressRegExp;
-
-  // combined OR of FullUrlRegExp and EmailAddressRegExp
-  static const QRegExp CompleteUrlRegExp;
-};
-
-class FilterObject:public QObject
-{
-Q_OBJECT public:
-  FilterObject (Filter::HotSpot * filter):_filter (filter)
-  {
-  }
-  private slots:void activated ();
-private:
-  Filter::HotSpot * _filter;
-};
-
-/** 
- * A chain which allows a group of filters to be processed as one. 
- * The chain owns the filters added to it and deletes them when the chain itself is destroyed.
- *
- * Use addFilter() to add a new filter to the chain.  
- * When new text to be filtered arrives, use addLine() to add each additional
- * line of text which needs to be processed and then after adding the last line, use
- * process() to cause each filter in the chain to process the text.
- *
- * After processing a block of text, the reset() method can be used to set the filter chain's
- * internal cursor back to the first line.
- *
- * The hotSpotAt() method will return the first hotspot which covers a given position.
- *
- * The hotSpots() and hotSpotsAtLine() method return all of the hotspots in the text and on
- * a given line respectively.
- */
-class FilterChain:protected QList < Filter * >
-{
-public:
-  virtual ~ FilterChain ();
-
-    /** Adds a new filter to the chain.  The chain will delete this filter when it is destroyed */
-  void addFilter (Filter * filter);
-    /** Removes a filter from the chain.  The chain will no longer delete the filter when destroyed */
-  void removeFilter (Filter * filter);
-    /** Returns true if the chain contains @p filter */
-  bool containsFilter (Filter * filter);
-    /** Removes all filters from the chain */
-  void clear ();
-
-    /** Resets each filter in the chain */
-  void reset ();
-    /**
-     * Processes each filter in the chain 
-     */
-  void process ();
-
-    /** Sets the buffer for each filter in the chain to process. */
-  void setBuffer (const QString * buffer, const QList < int >*linePositions);
-
-    /** Returns the first hotspot which occurs at @p line, @p column or 0 if no hotspot was found */
-    Filter::HotSpot * hotSpotAt (int line, int column) const;
-    /** Returns a list of all the hotspots in all the chain's filters */
-    QList < Filter::HotSpot * >hotSpots () const;
-    /** Returns a list of all hotspots at the given line in all the chain's filters */
-    QList < Filter::HotSpot > hotSpotsAtLine (int line) const;
-
-};
-
-/** A filter chain which processes character images from terminal displays */
-class TerminalImageFilterChain:public FilterChain
-{
-public:
-  TerminalImageFilterChain ();
-  virtual ~ TerminalImageFilterChain ();
-
-    /**
-     * Set the current terminal image to @p image.
-     *
-     * @param image The terminal image
-     * @param lines The number of lines in the terminal image
-     * @param columns The number of columns in the terminal image
-     * @param lineProperties The line properties to set for image
-     */
-  void setImage (const Character * const image, int lines, int columns,
-		 const QVector < LineProperty > &lineProperties);
-
-private:
-    QString * _buffer;
-    QList < int >*_linePositions;
-};
-
-#endif //FILTER_H

deleted file mode 100644
--- a/gui/src/terminal/QTerminalWidget.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*  Copyright (C) 2008 e_k (e_k@users.sourceforge.net)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-		
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-				
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include "QTerminalWidget.h"
-#include "Session.h"
-#include "TerminalDisplay.h"
-
-struct TermWidgetImpl
-{
-  TermWidgetImpl (QWidget * parent = 0);
-
-  TerminalDisplay *m_terminalDisplay;
-  Session *m_session;
-  Session *createSession ();
-  TerminalDisplay *createTerminalDisplay (QWidget * parent);
-};
-
-TermWidgetImpl::TermWidgetImpl (QWidget * parent)
-{
-  QPalette palette = QApplication::palette ();
-  m_session = createSession ();
-  m_terminalDisplay = createTerminalDisplay (parent);
-  m_terminalDisplay->setBackgroundColor (palette.color (QPalette::Base));
-  m_terminalDisplay->setForegroundColor (palette.color (QPalette::Text));
-}
-
-Session *
-TermWidgetImpl::createSession ()
-{
-  Session *session = new Session ();
-  session->setTitle (Session::NameRole, "QTerminalWidget");
-  session->setProgram ("/bin/bash");
-  session->setArguments (QStringList ());
-  session->setAutoClose (true);
-  session->setCodec (QTextCodec::codecForName ("UTF-8"));
-  session->setFlowControlEnabled (true);
-  session->setHistoryType (HistoryTypeBuffer (1000));
-  session->setDarkBackground (true);
-  session->setKeyBindings ("");
-  return session;
-}
-
-TerminalDisplay *
-TermWidgetImpl::createTerminalDisplay (QWidget * parent)
-{
-  TerminalDisplay *display = new TerminalDisplay (parent);
-  display->setBellMode (TerminalDisplay::NotifyBell);
-  display->setTerminalSizeHint (true);
-  display->setTripleClickMode (TerminalDisplay::SelectWholeLine);
-  display->setTerminalSizeStartup (true);
-  return display;
-}
-
-QTerminalWidget::QTerminalWidget (int startnow, QWidget * parent):QWidget
-  (parent)
-{
-  m_impl = new TermWidgetImpl (this);
-
-  initialize ();
-
-  if (startnow && m_impl->m_session)
-    {
-      m_impl->m_session->run ();
-    }
-
-  setFocus (Qt::OtherFocusReason);
-  m_impl->m_terminalDisplay->resize (this->size ());
-  setFocusProxy (m_impl->m_terminalDisplay);
-}
-
-void
-QTerminalWidget::initialize ()
-{
-  m_impl->m_terminalDisplay->setSize (80, 40);
-
-  QFont font = QApplication::font ();
-  font.setFamily ("Monospace");
-  font.setPointSize (10);
-  font.setStyleHint (QFont::TypeWriter);
-  m_impl->m_terminalDisplay->setVTFont (font);
-  m_impl->m_terminalDisplay->setScrollBarPosition (TerminalDisplay::ScrollBarRight);
-
-  m_impl->m_session->addView (m_impl->m_terminalDisplay);
-
-  connect (m_impl->m_session, SIGNAL (finished ()), this,
-	   SLOT (sessionFinished ()));
-}
-
-QTerminalWidget::~QTerminalWidget ()
-{
-  emit destroyed ();
-}
-
-void
-QTerminalWidget::openTeletype (int fd)
-{
-  m_impl->m_session->openTeletype (fd);
-}
-
-void
-QTerminalWidget::setTextCodec (QTextCodec * codec)
-{
-  if (!m_impl->m_session)
-    return;
-  m_impl->m_session->setCodec (codec);
-}
-
-void
-QTerminalWidget::setSize (int h, int v)
-{
-  if (!m_impl->m_terminalDisplay)
-    return;
-  m_impl->m_terminalDisplay->setSize (h, v);
-}
-
-void
-QTerminalWidget::setHistorySize (int lines)
-{
-  if (lines < 0)
-    m_impl->m_session->setHistoryType (HistoryTypeFile ());
-  else
-    m_impl->m_session->setHistoryType (HistoryTypeBuffer (lines));
-}
-
-void
-QTerminalWidget::sendText (const QString & text)
-{
-  m_impl->m_session->sendText (text);
-}
-
-void
-QTerminalWidget::resizeEvent (QResizeEvent *)
-{
-  m_impl->m_terminalDisplay->resize (this->size ());
-  m_impl->m_terminalDisplay->update ();
-}
-
-void
-QTerminalWidget::sessionFinished ()
-{
-  emit finished ();
-}

deleted file mode 100644
--- a/gui/src/terminal/QTerminalWidget.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Copyright (C) 2008 e_k (e_k@users.sourceforge.net)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef QTERMINALWIDGET_H
-#define QTERMINALWIDGET_H
-
-#include <QtGui>
-
-struct TermWidgetImpl;
-/**
-  * \class QTerminalWidget
-  * This class forms a widget class that can be inserted into other widgets.
-  */
-class QTerminalWidget:public QWidget
-{
-  Q_OBJECT
-public:
-  QTerminalWidget (int startnow = 1, QWidget * parent = 0);
-  ~QTerminalWidget ();
-
-  void openTeletype (int fd);
-
-  /** Text codec, default is UTF-8. */
-  void setTextCodec (QTextCodec * codec);
-
-  /** Resize terminal widget. */
-  void setSize (int h, int v);
-
-  /** History size for scrolling, values below zero mean infinite. */
-  void setHistorySize (int lines);
-
-  /** Send some text to the terminal. */
-  void sendText (const QString & text);
-
-signals:
-  /** Emitted, when the current program has finished. */
-  void finished ();
-
-protected:
-  virtual void resizeEvent (QResizeEvent *);
-
-protected slots:
-  void sessionFinished ();
-
-private:
-  /** Performs initial operations on this widget. */
-  void initialize ();
-  TermWidgetImpl *m_impl;
-};
-
-#endif // QTERMINALWIDGET_H

deleted file mode 100644
--- a/gui/src/terminal/Screen.cpp
+++ /dev/null
@@ -1,1528 +0,0 @@
-/*
-   This file is part of Konsole, an X terminal.
-
-   Copyright 2007-2008 by Robert Knight <robert.knight@gmail.com>
-   Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301  USA.
-   */
-
-// Own
-#include "Screen.h"
-
-// Standard
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-
-// Qt
-#include <QtCore/QTextStream>
-#include <QtCore/QDate>
-
-
-// Konsole
-#include "konsole_wcwidth.h"
-#include "TerminalCharacterDecoder.h"
-
-//FIXME: this is emulation specific. Use false for xterm, true for ANSI.
-//FIXME: see if we can get this from terminfo.
-#define BS_CLEARS false
-
-//Macro to convert x,y position on screen to position within an image.
-//
-//Originally the image was stored as one large contiguous block of 
-//memory, so a position within the image could be represented as an
-//offset from the beginning of the block.  For efficiency reasons this
-//is no longer the case.  
-//Many internal parts of this class still use this representation for parameters and so on,
-//notably moveImage() and clearImage().
-//This macro converts from an X,Y position into an image offset.
-#ifndef loc
-#define loc(X,Y) ((Y)*columns+(X))
-#endif
-
-
-Character
-  Screen::defaultChar = Character (' ',
-				   CharacterColor (COLOR_SPACE_DEFAULT,
-						   DEFAULT_FORE_COLOR),
-				   CharacterColor (COLOR_SPACE_DEFAULT,
-						   DEFAULT_BACK_COLOR),
-				   DEFAULT_RENDITION);
-
-//#define REVERSE_WRAPPED_LINES  // for wrapped line debug
-
-Screen::Screen (int l, int c):
-lines (l),
-columns (c),
-screenLines (new ImageLine[lines + 1]),
-_scrolledLines (0),
-_droppedLines (0),
-history (new HistoryScrollNone ()),
-cuX (0),
-cuY (0),
-currentRendition (0),
-_topMargin (0),
-_bottomMargin (0),
-selBegin (0),
-selTopLeft (0),
-selBottomRight (0),
-blockSelectionMode (false),
-effectiveForeground (CharacterColor ()),
-effectiveBackground (CharacterColor ()),
-effectiveRendition (0),
-lastPos (-1)
-{
-  lineProperties.resize (lines + 1);
-  for (int i = 0; i < lines + 1; i++)
-    lineProperties[i] = LINE_DEFAULT;
-
-  initTabStops ();
-  clearSelection ();
-  reset ();
-}
-
-/*! Destructor
-*/
-
-Screen::~Screen ()
-{
-  delete[]screenLines;
-  delete history;
-}
-
-void
-Screen::cursorUp (int n)
-    //=CUU
-{
-  if (n == 0)
-    n = 1;			// Default
-  int stop = cuY < _topMargin ? 0 : _topMargin;
-  cuX = qMin (columns - 1, cuX);	// nowrap!
-  cuY = qMax (stop, cuY - n);
-}
-
-void
-Screen::cursorDown (int n)
-    //=CUD
-{
-  if (n == 0)
-    n = 1;			// Default
-  int stop = cuY > _bottomMargin ? lines - 1 : _bottomMargin;
-  cuX = qMin (columns - 1, cuX);	// nowrap!
-  cuY = qMin (stop, cuY + n);
-}
-
-void
-Screen::cursorLeft (int n)
-    //=CUB
-{
-  if (n == 0)
-    n = 1;			// Default
-  cuX = qMin (columns - 1, cuX);	// nowrap!
-  cuX = qMax (0, cuX - n);
-}
-
-void
-Screen::cursorRight (int n)
-    //=CUF
-{
-  if (n == 0)
-    n = 1;			// Default
-  cuX = qMin (columns - 1, cuX + n);
-}
-
-void
-Screen::setMargins (int top, int bot)
-    //=STBM
-{
-  if (top == 0)
-    top = 1;			// Default
-  if (bot == 0)
-    bot = lines;		// Default
-  top = top - 1;		// Adjust to internal lineno
-  bot = bot - 1;		// Adjust to internal lineno
-  if (!(0 <= top && top < bot && bot < lines))
-    {				//Debug()<<" setRegion("<<top<<","<<bot<<") : bad range.";
-      return;			// Default error action: ignore
-    }
-  _topMargin = top;
-  _bottomMargin = bot;
-  cuX = 0;
-  cuY = getMode (MODE_Origin) ? top : 0;
-
-}
-
-int
-Screen::topMargin () const
-{
-  return _topMargin;
-}
-
-int
-Screen::bottomMargin () const
-{
-  return _bottomMargin;
-}
-
-void
-Screen::index ()
-    //=IND
-{
-  if (cuY == _bottomMargin)
-    scrollUp (1);
-  else if (cuY < lines - 1)
-    cuY += 1;
-}
-
-void
-Screen::reverseIndex ()
-    //=RI
-{
-  if (cuY == _topMargin)
-    scrollDown (_topMargin, 1);
-  else if (cuY > 0)
-    cuY -= 1;
-}
-
-void
-Screen::nextLine ()
-    //=NEL
-{
-  toStartOfLine ();
-  index ();
-}
-
-void
-Screen::eraseChars (int n)
-{
-  if (n == 0)
-    n = 1;			// Default
-  int p = qMax (0, qMin (cuX + n - 1, columns - 1));
-  clearImage (loc (cuX, cuY), loc (p, cuY), ' ');
-}
-
-void
-Screen::deleteChars (int n)
-{
-  Q_ASSERT (n >= 0);
-
-  // always delete at least one char
-  if (n == 0)
-    n = 1;
-
-  // if cursor is beyond the end of the line there is nothing to do
-  if (cuX >= screenLines[cuY].count ())
-    return;
-
-  if (cuX + n > screenLines[cuY].count ())
-    n = screenLines[cuY].count () - cuX;
-
-  Q_ASSERT (n >= 0);
-  Q_ASSERT (cuX + n <= screenLines[cuY].count ());
-
-  screenLines[cuY].remove (cuX, n);
-}
-
-void
-Screen::insertChars (int n)
-{
-  if (n == 0)
-    n = 1;			// Default
-
-  if (screenLines[cuY].size () < cuX)
-    screenLines[cuY].resize (cuX);
-
-  screenLines[cuY].insert (cuX, n, ' ');
-
-  if (screenLines[cuY].count () > columns)
-    screenLines[cuY].resize (columns);
-}
-
-void
-Screen::deleteLines (int n)
-{
-  if (n == 0)
-    n = 1;			// Default
-  scrollUp (cuY, n);
-}
-
-void
-Screen::insertLines (int n)
-{
-  if (n == 0)
-    n = 1;			// Default
-  scrollDown (cuY, n);
-}
-
-void
-Screen::setMode (int m)
-{
-  currentModes[m] = true;
-  switch (m)
-    {
-    case MODE_Origin:
-      cuX = 0;
-      cuY = _topMargin;
-      break;			//FIXME: home
-    }
-}
-
-void
-Screen::resetMode (int m)
-{
-  currentModes[m] = false;
-  switch (m)
-    {
-    case MODE_Origin:
-      cuX = 0;
-      cuY = 0;
-      break;			//FIXME: home
-    }
-}
-
-void
-Screen::saveMode (int m)
-{
-  savedModes[m] = currentModes[m];
-}
-
-void
-Screen::restoreMode (int m)
-{
-  currentModes[m] = savedModes[m];
-}
-
-bool
-Screen::getMode (int m) const
-{
-  return currentModes[m];
-}
-
-void
-Screen::saveCursor ()
-{
-  savedState.cursorColumn = cuX;
-  savedState.cursorLine = cuY;
-  savedState.rendition = currentRendition;
-  savedState.foreground = currentForeground;
-  savedState.background = currentBackground;
-}
-
-void
-Screen::restoreCursor ()
-{
-  cuX = qMin (savedState.cursorColumn, columns - 1);
-  cuY = qMin (savedState.cursorLine, lines - 1);
-  currentRendition = savedState.rendition;
-  currentForeground = savedState.foreground;
-  currentBackground = savedState.background;
-  updateEffectiveRendition ();
-}
-
-void
-Screen::resizeImage (int new_lines, int new_columns)
-{
-  if ((new_lines == lines) && (new_columns == columns))
-    return;
-
-  if (cuY > new_lines - 1)
-    {				// attempt to preserve focus and lines
-      _bottomMargin = lines - 1;	//FIXME: margin lost
-      for (int i = 0; i < cuY - (new_lines - 1); i++)
-	{
-	  addHistLine ();
-	  scrollUp (0, 1);
-	}
-    }
-
-  // create new screen lines and copy from old to new
-
-  ImageLine *newScreenLines = new ImageLine[new_lines + 1];
-  for (int i = 0; i < qMin (lines - 1, new_lines + 1); i++)
-    newScreenLines[i] = screenLines[i];
-  for (int i = lines; (i > 0) && (i < new_lines + 1); i++)
-    newScreenLines[i].resize (new_columns);
-
-  lineProperties.resize (new_lines + 1);
-  for (int i = lines; (i > 0) && (i < new_lines + 1); i++)
-    lineProperties[i] = LINE_DEFAULT;
-
-  clearSelection ();
-
-  delete[]screenLines;
-  screenLines = newScreenLines;
-
-  lines = new_lines;
-  columns = new_columns;
-  cuX = qMin (cuX, columns - 1);
-  cuY = qMin (cuY, lines - 1);
-
-  // FIXME: try to keep values, evtl.
-  _topMargin = 0;
-  _bottomMargin = lines - 1;
-  initTabStops ();
-  clearSelection ();
-}
-
-void
-Screen::setDefaultMargins ()
-{
-  _topMargin = 0;
-  _bottomMargin = lines - 1;
-}
-
-
-/*
-   Clarifying rendition here and in the display.
-
-   currently, the display's color table is
-   0       1       2 .. 9    10 .. 17
-   dft_fg, dft_bg, dim 0..7, intensive 0..7
-
-   currentForeground, currentBackground contain values 0..8;
-   - 0    = default color
-   - 1..8 = ansi specified color
-
-   re_fg, re_bg contain values 0..17
-   due to the TerminalDisplay's color table
-
-   rendition attributes are
-
-   attr           widget screen
-   -------------- ------ ------
-   RE_UNDERLINE     XX     XX    affects foreground only
-   RE_BLINK         XX     XX    affects foreground only
-   RE_BOLD          XX     XX    affects foreground only
-   RE_REVERSE       --     XX
-   RE_TRANSPARENT   XX     --    affects background only
-   RE_INTENSIVE     XX     --    affects foreground only
-
-   Note that RE_BOLD is used in both widget
-   and screen rendition. Since xterm/vt102
-   is to poor to distinguish between bold
-   (which is a font attribute) and intensive
-   (which is a color attribute), we translate
-   this and RE_BOLD in falls eventually appart
-   into RE_BOLD and RE_INTENSIVE.
-   */
-
-void
-Screen::reverseRendition (Character & p) const
-{
-  CharacterColor f = p.foregroundColor;
-  CharacterColor b = p.backgroundColor;
-
-  p.foregroundColor = b;
-  p.backgroundColor = f;	//p->r &= ~RE_TRANSPARENT;
-}
-
-void
-Screen::updateEffectiveRendition ()
-{
-  effectiveRendition = currentRendition;
-  if (currentRendition & RE_REVERSE)
-    {
-      effectiveForeground = currentBackground;
-      effectiveBackground = currentForeground;
-    }
-  else
-    {
-      effectiveForeground = currentForeground;
-      effectiveBackground = currentBackground;
-    }
-
-  if (currentRendition & RE_BOLD)
-    effectiveForeground.toggleIntensive ();
-}
-
-void
-Screen::copyFromHistory (Character * dest, int startLine, int count) const
-{
-  Q_ASSERT (startLine >= 0 && count > 0
-	    && startLine + count <= history->getLines ());
-
-  for (int line = startLine; line < startLine + count; line++)
-    {
-      const int length = qMin (columns, history->getLineLen (line));
-      const int destLineOffset = (line - startLine) * columns;
-
-      history->getCells (line, 0, length, dest + destLineOffset);
-
-      for (int column = length; column < columns; column++)
-	dest[destLineOffset + column] = defaultChar;
-
-      // invert selected text
-      if (selBegin != -1)
-	{
-	  for (int column = 0; column < columns; column++)
-	    {
-	      if (isSelected (column, line))
-		{
-		  reverseRendition (dest[destLineOffset + column]);
-		}
-	    }
-	}
-    }
-}
-
-void
-Screen::copyFromScreen (Character * dest, int startLine, int count) const
-{
-  Q_ASSERT (startLine >= 0 && count > 0 && startLine + count <= lines);
-
-  for (int line = startLine; line < (startLine + count); line++)
-    {
-      int srcLineStartIndex = line * columns;
-      int destLineStartIndex = (line - startLine) * columns;
-
-      for (int column = 0; column < columns; column++)
-	{
-	  int srcIndex = srcLineStartIndex + column;
-	  int destIndex = destLineStartIndex + column;
-
-	  dest[destIndex] =
-	    screenLines[srcIndex / columns].value (srcIndex % columns,
-						   defaultChar);
-
-	  // invert selected text
-	  if (selBegin != -1
-	      && isSelected (column, line + history->getLines ()))
-	    reverseRendition (dest[destIndex]);
-	}
-
-    }
-}
-
-void
-Screen::getImage (Character * dest, int size, int startLine, int endLine) const
-{
-  Q_ASSERT (startLine >= 0);
-  Q_ASSERT (endLine >= startLine && endLine < history->getLines () + lines);
-
-  const int mergedLines = endLine - startLine + 1;
-
-  Q_ASSERT (size >= mergedLines * columns);
-  Q_UNUSED (size);
-
-  const int linesInHistoryBuffer =
-    qBound (0, history->getLines () - startLine, mergedLines);
-  const int linesInScreenBuffer = mergedLines - linesInHistoryBuffer;
-
-  // copy lines from history buffer
-  if (linesInHistoryBuffer > 0)
-    copyFromHistory (dest, startLine, linesInHistoryBuffer);
-
-  // copy lines from screen buffer
-  if (linesInScreenBuffer > 0)
-    copyFromScreen (dest + linesInHistoryBuffer * columns,
-		    startLine + linesInHistoryBuffer - history->getLines (),
-		    linesInScreenBuffer);
-
-  // invert display when in screen mode
-  if (getMode (MODE_Screen))
-    {
-      for (int i = 0; i < mergedLines * columns; i++)
-	reverseRendition (dest[i]);	// for reverse display
-    }
-
-  // mark the character at the current cursor position
-  int cursorIndex = loc (cuX, cuY + linesInHistoryBuffer);
-  if (getMode (MODE_Cursor) && cursorIndex < columns * mergedLines)
-    dest[cursorIndex].rendition |= RE_CURSOR;
-}
-
-QVector < LineProperty > Screen::getLineProperties (int startLine,
-                                                    int endLine) const
-{
-  Q_ASSERT (startLine >= 0);
-  Q_ASSERT (endLine >= startLine && endLine < history->getLines () + lines);
-
-  const int
-    mergedLines = endLine - startLine + 1;
-  const int
-    linesInHistory =
-    qBound (0, history->getLines () - startLine, mergedLines);
-  const int
-    linesInScreen = mergedLines - linesInHistory;
-
-  QVector < LineProperty > result (mergedLines);
-  int
-    index = 0;
-
-  // copy properties for lines in history
-  for (int line = startLine; line < startLine + linesInHistory; line++)
-    {
-      //TODO Support for line properties other than wrapped lines
-      if (history->isWrappedLine (line))
-	{
-	  result[index] = (LineProperty) (result[index] | LINE_WRAPPED);
-	}
-      index++;
-    }
-
-  // copy properties for lines in screen buffer
-  const int
-    firstScreenLine = startLine + linesInHistory - history->getLines ();
-  for (int line = firstScreenLine; line < firstScreenLine + linesInScreen;
-       line++)
-    {
-      result[index] = lineProperties[line];
-      index++;
-    }
-
-  return result;
-}
-
-void
-Screen::reset (bool clearScreen)
-{
-  setMode (MODE_Wrap);
-  saveMode (MODE_Wrap);		// wrap at end of margin
-  resetMode (MODE_Origin);
-  saveMode (MODE_Origin);	// position refere to [1,1]
-  resetMode (MODE_Insert);
-  saveMode (MODE_Insert);	// overstroke
-  setMode (MODE_Cursor);	// cursor visible
-  resetMode (MODE_Screen);	// screen not inverse
-  resetMode (MODE_NewLine);
-
-  _topMargin = 0;
-  _bottomMargin = lines - 1;
-
-  setDefaultRendition ();
-  saveCursor ();
-
-  if (clearScreen)
-    clear ();
-}
-
-void
-Screen::clear ()
-{
-  clearEntireScreen ();
-  home ();
-}
-
-void
-Screen::backspace ()
-{
-  cuX = qMin (columns - 1, cuX);	// nowrap!
-  cuX = qMax (0, cuX - 1);
-
-  if (screenLines[cuY].size () < cuX + 1)
-    screenLines[cuY].resize (cuX + 1);
-
-  if (BS_CLEARS)
-    screenLines[cuY][cuX].character = ' ';
-}
-
-void
-Screen::tab (int n)
-{
-  // note that TAB is a format effector (does not write ' ');
-  if (n == 0)
-    n = 1;
-  while ((n > 0) && (cuX < columns - 1))
-    {
-      cursorRight (1);
-      while ((cuX < columns - 1) && !tabStops[cuX])
-	cursorRight (1);
-      n--;
-    }
-}
-
-void
-Screen::backtab (int n)
-{
-  // note that TAB is a format effector (does not write ' ');
-  if (n == 0)
-    n = 1;
-  while ((n > 0) && (cuX > 0))
-    {
-      cursorLeft (1);
-      while ((cuX > 0) && !tabStops[cuX])
-	cursorLeft (1);
-      n--;
-    }
-}
-
-void
-Screen::clearTabStops ()
-{
-  for (int i = 0; i < columns; i++)
-    tabStops[i] = false;
-}
-
-void
-Screen::changeTabStop (bool set)
-{
-  if (cuX >= columns)
-    return;
-  tabStops[cuX] = set;
-}
-
-void
-Screen::initTabStops ()
-{
-  tabStops.resize (columns);
-
-  // Arrg! The 1st tabstop has to be one longer than the other.
-  // i.e. the kids start counting from 0 instead of 1.
-  // Other programs might behave correctly. Be aware.
-  for (int i = 0; i < columns; i++)
-    tabStops[i] = (i % 8 == 0 && i != 0);
-}
-
-void
-Screen::newLine ()
-{
-  if (getMode (MODE_NewLine))
-    toStartOfLine ();
-  index ();
-}
-
-void
-Screen::checkSelection (int from, int to)
-{
-  if (selBegin == -1)
-    return;
-  int scr_TL = loc (0, history->getLines ());
-  //Clear entire selection if it overlaps region [from, to]
-  if ((selBottomRight >= (from + scr_TL)) && (selTopLeft <= (to + scr_TL)))
-    clearSelection ();
-}
-
-void
-Screen::displayCharacter (unsigned short c)
-{
-  // Note that VT100 does wrapping BEFORE putting the character.
-  // This has impact on the assumption of valid cursor positions.
-  // We indicate the fact that a newline has to be triggered by
-  // putting the cursor one right to the last column of the screen.
-
-  int w = konsole_wcwidth (c);
-  if (w <= 0)
-    return;
-
-  if (cuX + w > columns)
-    {
-      if (getMode (MODE_Wrap))
-	{
-	  lineProperties[cuY] =
-	    (LineProperty) (lineProperties[cuY] | LINE_WRAPPED);
-	  nextLine ();
-	}
-      else
-	cuX = columns - w;
-    }
-
-  // ensure current line vector has enough elements
-  int size = screenLines[cuY].size ();
-  if (size < cuX + w)
-    {
-      screenLines[cuY].resize (cuX + w);
-    }
-
-  if (getMode (MODE_Insert))
-    insertChars (w);
-
-  lastPos = loc (cuX, cuY);
-
-  // check if selection is still valid.
-  checkSelection (lastPos, lastPos);
-
-  Character & currentChar = screenLines[cuY][cuX];
-
-  currentChar.character = c;
-  currentChar.foregroundColor = effectiveForeground;
-  currentChar.backgroundColor = effectiveBackground;
-  currentChar.rendition = effectiveRendition;
-
-  int i = 0;
-  int newCursorX = cuX + w--;
-  while (w)
-    {
-      i++;
-
-      if (screenLines[cuY].size () < cuX + i + 1)
-	screenLines[cuY].resize (cuX + i + 1);
-
-      Character & ch = screenLines[cuY][cuX + i];
-      ch.character = 0;
-      ch.foregroundColor = effectiveForeground;
-      ch.backgroundColor = effectiveBackground;
-      ch.rendition = effectiveRendition;
-
-      w--;
-    }
-  cuX = newCursorX;
-}
-
-void
-Screen::compose (const QString & /*compose */ )
-{
-  Q_ASSERT (0 /*Not implemented yet */ );
-
-  /*  if (lastPos == -1)
-     return;
-
-     QChar c(image[lastPos].character);
-     compose.prepend(c);
-     //compose.compose(); ### FIXME!
-     image[lastPos].character = compose[0].unicode(); */
-}
-
-int
-Screen::scrolledLines () const
-{
-  return _scrolledLines;
-}
-
-int
-Screen::droppedLines () const
-{
-  return _droppedLines;
-}
-
-void
-Screen::resetDroppedLines ()
-{
-  _droppedLines = 0;
-}
-
-void
-Screen::resetScrolledLines ()
-{
-  _scrolledLines = 0;
-}
-
-void
-Screen::scrollUp (int n)
-{
-  if (n == 0)
-    n = 1;			// Default
-  if (_topMargin == 0)
-    addHistLine ();		// history.history
-  scrollUp (_topMargin, n);
-}
-
-QRect
-Screen::lastScrolledRegion () const
-{
-  return _lastScrolledRegion;
-}
-
-void
-Screen::scrollUp (int from, int n)
-{
-  if (n <= 0 || from + n > _bottomMargin)
-    return;
-
-  _scrolledLines -= n;
-  _lastScrolledRegion =
-    QRect (0, _topMargin, columns - 1, (_bottomMargin - _topMargin));
-
-  //FIXME: make sure `topMargin', `bottomMargin', `from', `n' is in bounds.
-  moveImage (loc (0, from), loc (0, from + n),
-	     loc (columns - 1, _bottomMargin));
-  clearImage (loc (0, _bottomMargin - n + 1),
-	      loc (columns - 1, _bottomMargin), ' ');
-}
-
-void
-Screen::scrollDown (int n)
-{
-  if (n == 0)
-    n = 1;			// Default
-  scrollDown (_topMargin, n);
-}
-
-void
-Screen::scrollDown (int from, int n)
-{
-  _scrolledLines += n;
-
-  //FIXME: make sure `topMargin', `bottomMargin', `from', `n' is in bounds.
-  if (n <= 0)
-    return;
-  if (from > _bottomMargin)
-    return;
-  if (from + n > _bottomMargin)
-    n = _bottomMargin - from;
-  moveImage (loc (0, from + n), loc (0, from),
-	     loc (columns - 1, _bottomMargin - n));
-  clearImage (loc (0, from), loc (columns - 1, from + n - 1), ' ');
-}
-
-void
-Screen::setCursorYX (int y, int x)
-{
-  setCursorY (y);
-  setCursorX (x);
-}
-
-void
-Screen::setCursorX (int x)
-{
-  if (x == 0)
-    x = 1;			// Default
-  x -= 1;			// Adjust
-  cuX = qMax (0, qMin (columns - 1, x));
-}
-
-void
-Screen::setCursorY (int y)
-{
-  if (y == 0)
-    y = 1;			// Default
-  y -= 1;			// Adjust
-  cuY =
-    qMax (0, qMin (lines - 1, y + (getMode (MODE_Origin) ? _topMargin : 0)));
-}
-
-void
-Screen::home ()
-{
-  cuX = 0;
-  cuY = 0;
-}
-
-void
-Screen::toStartOfLine ()
-{
-  cuX = 0;
-}
-
-int
-Screen::getCursorX () const
-{
-  return cuX;
-}
-
-int
-Screen::getCursorY () const
-{
-  return cuY;
-}
-
-void
-Screen::clearImage (int loca, int loce, char c)
-{
-  int scr_TL = loc (0, history->getLines ());
-  //FIXME: check positions
-
-  //Clear entire selection if it overlaps region to be moved...
-  if ((selBottomRight > (loca + scr_TL)) && (selTopLeft < (loce + scr_TL)))
-    {
-      clearSelection ();
-    }
-
-  int topLine = loca / columns;
-  int bottomLine = loce / columns;
-
-  Character clearCh (c, currentForeground, currentBackground,
-		     DEFAULT_RENDITION);
-
-  //if the character being used to clear the area is the same as the
-  //default character, the affected lines can simply be shrunk.
-  bool isDefaultCh = (clearCh == Character ());
-
-  for (int y = topLine; y <= bottomLine; y++)
-    {
-      lineProperties[y] = 0;
-
-      int endCol = (y == bottomLine) ? loce % columns : columns - 1;
-      int startCol = (y == topLine) ? loca % columns : 0;
-
-      QVector < Character > &line = screenLines[y];
-
-      if (isDefaultCh && endCol == columns - 1)
-	{
-	  line.resize (startCol);
-	}
-      else
-	{
-	  if (line.size () < endCol + 1)
-	    line.resize (endCol + 1);
-
-	  Character *data = line.data ();
-	  for (int i = startCol; i <= endCol; i++)
-	    data[i] = clearCh;
-	}
-    }
-}
-
-void
-Screen::moveImage (int dest, int sourceBegin, int sourceEnd)
-{
-  Q_ASSERT (sourceBegin <= sourceEnd);
-
-  int lines = (sourceEnd - sourceBegin) / columns;
-
-  //move screen image and line properties:
-  //the source and destination areas of the image may overlap, 
-  //so it matters that we do the copy in the right order - 
-  //forwards if dest < sourceBegin or backwards otherwise.
-  //(search the web for 'memmove implementation' for details)
-  if (dest < sourceBegin)
-    {
-      for (int i = 0; i <= lines; i++)
-	{
-	  screenLines[(dest / columns) + i] =
-	    screenLines[(sourceBegin / columns) + i];
-	  lineProperties[(dest / columns) + i] =
-	    lineProperties[(sourceBegin / columns) + i];
-	}
-    }
-  else
-    {
-      for (int i = lines; i >= 0; i--)
-	{
-	  screenLines[(dest / columns) + i] =
-	    screenLines[(sourceBegin / columns) + i];
-	  lineProperties[(dest / columns) + i] =
-	    lineProperties[(sourceBegin / columns) + i];
-	}
-    }
-
-  if (lastPos != -1)
-    {
-      int diff = dest - sourceBegin;	// Scroll by this amount
-      lastPos += diff;
-      if ((lastPos < 0) || (lastPos >= (lines * columns)))
-	lastPos = -1;
-    }
-
-  // Adjust selection to follow scroll.
-  if (selBegin != -1)
-    {
-      bool beginIsTL = (selBegin == selTopLeft);
-      int diff = dest - sourceBegin;	// Scroll by this amount
-      int scr_TL = loc (0, history->getLines ());
-      int srca = sourceBegin + scr_TL;	// Translate index from screen to global
-      int srce = sourceEnd + scr_TL;	// Translate index from screen to global
-      int desta = srca + diff;
-      int deste = srce + diff;
-
-      if ((selTopLeft >= srca) && (selTopLeft <= srce))
-	selTopLeft += diff;
-      else if ((selTopLeft >= desta) && (selTopLeft <= deste))
-	selBottomRight = -1;	// Clear selection (see below)
-
-      if ((selBottomRight >= srca) && (selBottomRight <= srce))
-	selBottomRight += diff;
-      else if ((selBottomRight >= desta) && (selBottomRight <= deste))
-	selBottomRight = -1;	// Clear selection (see below)
-
-      if (selBottomRight < 0)
-	{
-	  clearSelection ();
-	}
-      else
-	{
-	  if (selTopLeft < 0)
-	    selTopLeft = 0;
-	}
-
-      if (beginIsTL)
-	selBegin = selTopLeft;
-      else
-	selBegin = selBottomRight;
-    }
-}
-
-void
-Screen::clearToEndOfScreen ()
-{
-  clearImage (loc (cuX, cuY), loc (columns - 1, lines - 1), ' ');
-}
-
-void
-Screen::clearToBeginOfScreen ()
-{
-  clearImage (loc (0, 0), loc (cuX, cuY), ' ');
-}
-
-void
-Screen::clearEntireScreen ()
-{
-  // Add entire screen to history
-  for (int i = 0; i < (lines - 1); i++)
-    {
-      addHistLine ();
-      scrollUp (0, 1);
-    }
-
-  clearImage (loc (0, 0), loc (columns - 1, lines - 1), ' ');
-}
-
-/*! fill screen with 'E'
-  This is to aid screen alignment
-  */
-
-void
-Screen::helpAlign ()
-{
-  clearImage (loc (0, 0), loc (columns - 1, lines - 1), 'E');
-}
-
-void
-Screen::clearToEndOfLine ()
-{
-  clearImage (loc (cuX, cuY), loc (columns - 1, cuY), ' ');
-}
-
-void
-Screen::clearToBeginOfLine ()
-{
-  clearImage (loc (0, cuY), loc (cuX, cuY), ' ');
-}
-
-void
-Screen::clearEntireLine ()
-{
-  clearImage (loc (0, cuY), loc (columns - 1, cuY), ' ');
-}
-
-void
-Screen::setRendition (int re)
-{
-  currentRendition |= re;
-  updateEffectiveRendition ();
-}
-
-void
-Screen::resetRendition (int re)
-{
-  currentRendition &= ~re;
-  updateEffectiveRendition ();
-}
-
-void
-Screen::setDefaultRendition ()
-{
-  setForeColor (COLOR_SPACE_DEFAULT, DEFAULT_FORE_COLOR);
-  setBackColor (COLOR_SPACE_DEFAULT, DEFAULT_BACK_COLOR);
-  currentRendition = DEFAULT_RENDITION;
-  updateEffectiveRendition ();
-}
-
-void
-Screen::setForeColor (int space, int color)
-{
-  currentForeground = CharacterColor (space, color);
-
-  if (currentForeground.isValid ())
-    updateEffectiveRendition ();
-  else
-    setForeColor (COLOR_SPACE_DEFAULT, DEFAULT_FORE_COLOR);
-}
-
-void
-Screen::setBackColor (int space, int color)
-{
-  currentBackground = CharacterColor (space, color);
-
-  if (currentBackground.isValid ())
-    updateEffectiveRendition ();
-  else
-    setBackColor (COLOR_SPACE_DEFAULT, DEFAULT_BACK_COLOR);
-}
-
-void
-Screen::clearSelection ()
-{
-  selBottomRight = -1;
-  selTopLeft = -1;
-  selBegin = -1;
-}
-
-void
-Screen::getSelectionStart (int &column, int &line) const
-{
-  if (selTopLeft != -1)
-    {
-      column = selTopLeft % columns;
-      line = selTopLeft / columns;
-    }
-  else
-    {
-      column = cuX + getHistLines ();
-      line = cuY + getHistLines ();
-    }
-}
-
-void
-Screen::getSelectionEnd (int &column, int &line) const
-{
-  if (selBottomRight != -1)
-    {
-      column = selBottomRight % columns;
-      line = selBottomRight / columns;
-    }
-  else
-    {
-      column = cuX + getHistLines ();
-      line = cuY + getHistLines ();
-    }
-}
-
-void
-Screen::setSelectionStart (const int x, const int y, const bool mode)
-{
-  selBegin = loc (x, y);
-  /* FIXME, HACK to correct for x too far to the right... */
-  if (x == columns)
-    selBegin--;
-
-  selBottomRight = selBegin;
-  selTopLeft = selBegin;
-  blockSelectionMode = mode;
-}
-
-void
-Screen::setSelectionEnd (const int x, const int y)
-{
-  if (selBegin == -1)
-    return;
-
-  int endPos = loc (x, y);
-
-  if (endPos < selBegin)
-    {
-      selTopLeft = endPos;
-      selBottomRight = selBegin;
-    }
-  else
-    {
-      /* FIXME, HACK to correct for x too far to the right... */
-      if (x == columns)
-	endPos--;
-
-      selTopLeft = selBegin;
-      selBottomRight = endPos;
-    }
-
-  // Normalize the selection in column mode
-  if (blockSelectionMode)
-    {
-      int topRow = selTopLeft / columns;
-      int topColumn = selTopLeft % columns;
-      int bottomRow = selBottomRight / columns;
-      int bottomColumn = selBottomRight % columns;
-
-      selTopLeft = loc (qMin (topColumn, bottomColumn), topRow);
-      selBottomRight = loc (qMax (topColumn, bottomColumn), bottomRow);
-    }
-}
-
-bool
-Screen::isSelected (const int x, const int y) const
-{
-  bool columnInSelection = true;
-  if (blockSelectionMode)
-    {
-      columnInSelection = x >= (selTopLeft % columns) &&
-	x <= (selBottomRight % columns);
-    }
-
-  int pos = loc (x, y);
-  return pos >= selTopLeft && pos <= selBottomRight && columnInSelection;
-}
-
-QString
-Screen::selectedText (bool preserveLineBreaks) const
-{
-  QString result;
-  QTextStream stream (&result, QIODevice::ReadWrite);
-
-  PlainTextDecoder decoder;
-  decoder.begin (&stream);
-  writeSelectionToStream (&decoder, preserveLineBreaks);
-  decoder.end ();
-
-  return result;
-}
-
-bool
-Screen::isSelectionValid () const
-{
-  return selTopLeft >= 0 && selBottomRight >= 0;
-}
-
-void
-Screen::writeSelectionToStream (TerminalCharacterDecoder * decoder,
-                                bool preserveLineBreaks) const
-{
-  if (!isSelectionValid ())
-    return;
-  writeToStream (decoder, selTopLeft, selBottomRight, preserveLineBreaks);
-}
-
-void
-Screen::writeToStream (TerminalCharacterDecoder * decoder,
-		       int startIndex, int endIndex,
-                       bool preserveLineBreaks) const
-{
-  int top = startIndex / columns;
-  int left = startIndex % columns;
-
-  int bottom = endIndex / columns;
-  int right = endIndex % columns;
-
-  Q_ASSERT (top >= 0 && left >= 0 && bottom >= 0 && right >= 0);
-
-  for (int y = top; y <= bottom; y++)
-    {
-      int start = 0;
-      if (y == top || blockSelectionMode)
-	start = left;
-
-      int count = -1;
-      if (y == bottom || blockSelectionMode)
-	count = right - start + 1;
-
-      const bool appendNewLine = (y != bottom);
-      int copied = copyLineToStream (y,
-				     start,
-				     count,
-				     decoder,
-				     appendNewLine,
-				     preserveLineBreaks);
-
-      // if the selection goes beyond the end of the last line then
-      // append a new line character.
-      //
-      // this makes it possible to 'select' a trailing new line character after
-      // the text on a line.  
-      if (y == bottom && copied < count)
-	{
-	  Character newLineChar ('\n');
-	  decoder->decodeLine (&newLineChar, 1, 0);
-	}
-    }
-}
-
-int
-Screen::copyLineToStream (int line,
-			  int start,
-			  int count,
-			  TerminalCharacterDecoder * decoder,
-			  bool appendNewLine,
-                          bool preserveLineBreaks) const
-{
-  //buffer to hold characters for decoding
-  //the buffer is static to avoid initialising every 
-  //element on each call to copyLineToStream
-  //(which is unnecessary since all elements will be overwritten anyway)
-  static const int MAX_CHARS = 1024;
-  static Character characterBuffer[MAX_CHARS];
-
-  assert (count < MAX_CHARS);
-
-  LineProperty currentLineProperties = 0;
-
-  //determine if the line is in the history buffer or the screen image
-  if (line < history->getLines ())
-    {
-      const int lineLength = history->getLineLen (line);
-
-      // ensure that start position is before end of line
-      start = qMin (start, qMax (0, lineLength - 1));
-
-      // retrieve line from history buffer.  It is assumed
-      // that the history buffer does not store trailing white space
-      // at the end of the line, so it does not need to be trimmed here 
-      if (count == -1)
-	{
-	  count = lineLength - start;
-	}
-      else
-	{
-	  count = qMin (start + count, lineLength) - start;
-	}
-
-      // safety checks
-      assert (start >= 0);
-      assert (count >= 0);
-      assert ((start + count) <= history->getLineLen (line));
-
-      history->getCells (line, start, count, characterBuffer);
-
-      if (history->isWrappedLine (line))
-	currentLineProperties |= LINE_WRAPPED;
-    }
-  else
-    {
-      if (count == -1)
-	count = columns - start;
-
-      assert (count >= 0);
-
-      const int screenLine = line - history->getLines ();
-
-      Character *data = screenLines[screenLine].data ();
-      int length = screenLines[screenLine].count ();
-
-      //retrieve line from screen image
-      for (int i = start; i < qMin (start + count, length); i++)
-	{
-	  characterBuffer[i - start] = data[i];
-	}
-
-      // count cannot be any greater than length
-      count = qBound (0, count, length - start);
-
-      Q_ASSERT (screenLine < lineProperties.count ());
-      currentLineProperties |= lineProperties[screenLine];
-    }
-
-  // add new line character at end
-  const bool omitLineBreak = (currentLineProperties & LINE_WRAPPED) ||
-    !preserveLineBreaks;
-
-  if (!omitLineBreak && appendNewLine && (count + 1 < MAX_CHARS))
-    {
-      characterBuffer[count] = '\n';
-      count++;
-    }
-
-  //decode line and write to text stream    
-  decoder->decodeLine ((Character *) characterBuffer,
-		       count, currentLineProperties);
-
-  return count;
-}
-
-void
-Screen::writeLinesToStream (TerminalCharacterDecoder * decoder, int fromLine,
-                            int toLine) const
-{
-  writeToStream (decoder, loc (0, fromLine), loc (columns - 1, toLine));
-}
-
-void
-Screen::addHistLine ()
-{
-  // add line to history buffer
-  // we have to take care about scrolling, too...
-
-  if (hasScroll ())
-    {
-      int oldHistLines = history->getLines ();
-
-      history->addCellsVector (screenLines[0]);
-      history->addLine (lineProperties[0] & LINE_WRAPPED);
-
-      int newHistLines = history->getLines ();
-
-      bool beginIsTL = (selBegin == selTopLeft);
-
-      // If the history is full, increment the count
-      // of dropped lines
-      if (newHistLines == oldHistLines)
-	_droppedLines++;
-
-      // Adjust selection for the new point of reference
-      if (newHistLines > oldHistLines)
-	{
-	  if (selBegin != -1)
-	    {
-	      selTopLeft += columns;
-	      selBottomRight += columns;
-	    }
-	}
-
-      if (selBegin != -1)
-	{
-	  // Scroll selection in history up
-	  int top_BR = loc (0, 1 + newHistLines);
-
-	  if (selTopLeft < top_BR)
-	    selTopLeft -= columns;
-
-	  if (selBottomRight < top_BR)
-	    selBottomRight -= columns;
-
-	  if (selBottomRight < 0)
-	    clearSelection ();
-	  else
-	    {
-	      if (selTopLeft < 0)
-		selTopLeft = 0;
-	    }
-
-	  if (beginIsTL)
-	    selBegin = selTopLeft;
-	  else
-	    selBegin = selBottomRight;
-	}
-    }
-
-}
-
-int
-Screen::getHistLines () const
-{
-  return history->getLines ();
-}
-
-void
-Screen::setScroll (const HistoryType & t, bool copyPreviousScroll)
-{
-  clearSelection ();
-
-  if (copyPreviousScroll)
-    history = t.scroll (history);
-  else
-    {
-      HistoryScroll *oldScroll = history;
-      history = t.scroll (0);
-      delete oldScroll;
-    }
-}
-
-bool
-Screen::hasScroll () const
-{
-  return history->hasScroll ();
-}
-
-const HistoryType &
-Screen::getScroll () const
-{
-  return history->getType ();
-}
-
-void
-Screen::setLineProperty (LineProperty property, bool enable)
-{
-  if (enable)
-    lineProperties[cuY] = (LineProperty) (lineProperties[cuY] | property);
-  else
-    lineProperties[cuY] = (LineProperty) (lineProperties[cuY] & ~property);
-}
-
-void
-Screen::fillWithDefaultChar (Character * dest, int count)
-{
-  for (int i = 0; i < count; i++)
-    dest[i] = defaultChar;
-}