6 files changed, 491 insertions, 214 deletions

diff --git a/core/apps/embeddedkonsole/TEHistory.cpp b/core/apps/embeddedkonsole/TEHistory.cpp
index 317ce57..db9d10c 100644
--- a/core/apps/embeddedkonsole/TEHistory.cpp
+++ b/core/apps/embeddedkonsole/TEHistory.cpp
@@ -9,11 +9,11 @@
 /* This file is part of Konsole - an X terminal for KDE                       */
 /*                                                                            */
 /* -------------------------------------------------------------------------- */
-        /*                                                                    */
+/*                        */
 /* Ported Konsole to Qt/Embedded                                              */
-        /*                                                                    */
+/*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
-        /*                                                                    */
+/*                        */
 /* -------------------------------------------------------------------------- */
 
 #include "TEHistory.h"
@@ -117,18 +117,24 @@ bool HistoryBuffer::hasScroll()
 void HistoryBuffer::add(const unsigned char* bytes, int len)
 { int rc;
   assert(hasScroll());
-  rc = lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::add.seek"); setScroll(FALSE); return; }
-  rc = write(ion,bytes,len);       if (rc < 0) { perror("HistoryBuffer::add.write"); setScroll(FALSE); return; }
+  rc = lseek( ion, length, SEEK_SET);
+  if (rc < 0) { perror("HistoryBuffer::add.seek"); setScroll(FALSE); return; }
+  rc = write( ion, bytes, len);
+  if (rc < 0) { perror("HistoryBuffer::add.write"); setScroll(FALSE); return; }
   length += rc;
 }
 
-void HistoryBuffer::get(unsigned char* bytes, int len, int loc)
-{ int rc;
+void HistoryBuffer::get(unsigned char* bytes, int len, int loc) {
+    int rc;
   assert(hasScroll());
+//  qDebug("history get len %d, loc %d, length %d", len, loc, length);
   if (loc < 0 || len < 0 || loc + len > length)
-    fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc);
-  rc = lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::get.seek"); setScroll(FALSE); return; }
-  rc = read(ion,bytes,len);     if (rc < 0) { perror("HistoryBuffer::get.read"); setScroll(FALSE); return; }
+     fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc);
+     
+  rc = lseek( ion, loc, SEEK_SET);
+  if (rc < 0) { perror("HistoryBuffer::get.seek"); setScroll(FALSE); return; }
+  rc = read( ion, bytes, len);
+  if (rc < 0) { perror("HistoryBuffer::get.read"); setScroll(FALSE); return; }
 }
 
 int HistoryBuffer::len()
@@ -195,7 +201,8 @@ int HistoryScroll::startOfLine(int lineno)
 void HistoryScroll::getCells(int lineno, int colno, int count, ca res[])
 {
   assert(hasScroll());
-  cells.get((unsigned char*)res,count*sizeof(ca),startOfLine(lineno)+colno*sizeof(ca));
+//get(unsigned char* bytes, int len, int loc)   
+  cells.get( (unsigned char*)res, count * sizeof(ca), startOfLine( lineno) + colno * sizeof(ca) );
 }
 
 void HistoryScroll::addCells(ca text[], int count)
diff --git a/core/apps/embeddedkonsole/TEScreen.cpp b/core/apps/embeddedkonsole/TEScreen.cpp
index a3d115d..50807d3 100644
--- a/core/apps/embeddedkonsole/TEScreen.cpp
+++ b/core/apps/embeddedkonsole/TEScreen.cpp
@@ -9,12 +9,13 @@
 /* This file is part of Konsole - an X terminal for KDE                       */
 /*                                                                            */
 /* -------------------------------------------------------------------------- */
-        /*                                                                    */
+/*                        */
 /* Ported Konsole to Qt/Embedded                                              */
-        /*                                                                    */
+/*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
-        /*                                                                    */
+/*                        */
 /* -------------------------------------------------------------------------- */
+// enhancements added by L.J. Potter <ljp@llornkcor.com>
 
 /*! \file
 */
@@ -50,6 +51,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <qpe/config.h>
 #include "TEScreen.h"
 
 #define HERE printf("%s(%d): here\n",__FILE__,__LINE__)
@@ -58,7 +60,7 @@
 //FIXME: see if we can get this from terminfo.
 #define BS_CLEARS FALSE
 
-#define loc(X,Y) ((Y)*columns+(X))
+#define loc(X,Y) ((Y) * columns + (X))
 
 /*! creates a `TEScreen' of `lines' lines and `columns' columns.
 */
@@ -67,11 +69,13 @@ TEScreen::TEScreen(int lines, int columns)
 {
   this->lines   = lines;
   this->columns = columns;
-
+//  qDebug("Columns %d", columns);
+  
   image      = (ca*) malloc(lines*columns*sizeof(ca));
   tabstops   = NULL; initTabStops();
 
   histCursor = 0;
+  horzCursor = 0;
 
   clearSelection();
   reset();
@@ -383,53 +387,49 @@ void TEScreen::restoreCursor()
 
 void TEScreen::resizeImage(int new_lines, int new_columns)
 {
-
-  if (cuY > new_lines-1)
-  { // attempt to preserve focus and lines
-    bmargin = lines-1; //FIXME: margin lost
-    for (int i = 0; i < cuY-(new_lines-1); i++)
-    {
-      addHistLine(); scrollUp(0,1);
+    if (cuY > new_lines-1)  {
+// attempt to preserve focus and lines
+        bmargin = lines-1; //FIXME: margin lost
+        for (int i = 0; i < cuY-(new_lines-1); i++) {
+            addHistLine(); scrollUp(horzCursor,1);
+        }
     }
-  }
 
-  // make new image
-  ca* newimg = (ca*)malloc(new_lines*new_columns*sizeof(ca));
+      // make new image
+    ca* newimg = (ca*)malloc( new_lines * new_columns * sizeof( ca));
 
-  clearSelection();
-
-  // clear new image
-  for (int y = 0; y < new_lines; y++)
-  for (int x = 0; x < new_columns; x++)
-  {
-    newimg[y*new_columns+x].c = ' ';
-    newimg[y*new_columns+x].f = DEFAULT_FORE_COLOR;
-    newimg[y*new_columns+x].b = DEFAULT_BACK_COLOR;
-    newimg[y*new_columns+x].r = DEFAULT_RENDITION;
-  }
-  int cpy_lines   = QMIN(new_lines,  lines);
-  int cpy_columns = QMIN(new_columns,columns);
-  // copy to new image
-  for (int y = 0; y < cpy_lines; y++)
-  for (int x = 0; x < cpy_columns; x++)
-  {
-    newimg[y*new_columns+x].c = image[loc(x,y)].c;
-    newimg[y*new_columns+x].f = image[loc(x,y)].f;
-    newimg[y*new_columns+x].b = image[loc(x,y)].b;
-    newimg[y*new_columns+x].r = image[loc(x,y)].r;
-  }
-  free(image);
-  image = newimg;
-  lines = new_lines;
-  columns = new_columns;
-  cuX = QMIN(cuX,columns-1);
-  cuY = QMIN(cuY,lines-1);
+    clearSelection();
 
-  // FIXME: try to keep values, evtl.
-  tmargin=0;
-  bmargin=lines-1;
-  initTabStops();
-  clearSelection();
+      // clear new image
+    for (int y = 0; y < new_lines; y++)
+        for (int x = 0; x < new_columns; x++) {
+            newimg[y*new_columns+x].c = ' ';
+            newimg[y*new_columns+x].f = DEFAULT_FORE_COLOR;
+            newimg[y*new_columns+x].b = DEFAULT_BACK_COLOR;
+            newimg[y*new_columns+x].r = DEFAULT_RENDITION;
+        }
+    int cpy_lines   = QMIN(new_lines,  lines);
+    int cpy_columns = QMIN(new_columns,columns);
+      // copy to new image
+    for (int y = 0; y < cpy_lines; y++)
+        for (int x = 0; x < cpy_columns; x++) {
+            newimg[y*new_columns+x].c = image[loc(x,y)].c;
+            newimg[y*new_columns+x].f = image[loc(x,y)].f;
+            newimg[y*new_columns+x].b = image[loc(x,y)].b;
+            newimg[y*new_columns+x].r = image[loc(x,y)].r;
+        }
+    free(image);
+    image = newimg;
+    lines = new_lines;
+    columns = new_columns;
+    cuX = QMIN(cuX,columns-1);
+    cuY = QMIN(cuY,lines-1);
+
+      // FIXME: try to keep values, evtl.
+    tmargin=0;
+    bmargin=lines-1;
+    initTabStops();
+    clearSelection();
 }
 
 /*
@@ -505,7 +505,8 @@ void TEScreen::effectiveRendition()
 */
 
 ca* TEScreen::getCookedImage()
-{ int x,y;
+{
+ int x,y;
   ca* merged = (ca*)malloc(lines*columns*sizeof(ca));
   ca dft(' ',DEFAULT_FORE_COLOR,DEFAULT_BACK_COLOR,DEFAULT_RENDITION);
 
@@ -548,6 +549,65 @@ ca* TEScreen::getCookedImage()
   if (getMode(MODE_Cursor) && (cuY+(hist.getLines()-histCursor) < lines)) // cursor visible
     reverseRendition(&merged[loc(cuX,cuY+(hist.getLines()-histCursor))]);
   return merged;
+
+    /*
+    int x, y, z;
+
+  ca* merged = (ca*)malloc( lines * columns * sizeof( ca));
+
+  ca dft(' ',DEFAULT_FORE_COLOR,DEFAULT_BACK_COLOR,DEFAULT_RENDITION);
+
+//      qDebug("hist lines %d, historyCursor %d, minus %d ,lines %d, columns %d",
+//               hist.getLines(), histCursor, hist.getLines() - histCursor , lines, columns);
+  for (y = 0; (y < lines) && (y < ( hist.getLines() - histCursor )); y++)  {
+
+    int len = QMIN( columns, hist.getLineLen( y + histCursor) );
+    int yp  = y * columns;
+    int yq  = ( y + histCursor) * columns;
+//     qDebug("horzCursor %d, columns %d, len %d", horzCursor, columns, len);    
+//     qDebug("lineno %d, colno %d, count %d\n",  y + histCursor, (horzCursor / 2), len );
+    qDebug("Y %d", y);    
+    hist.getCells( y + histCursor, (horzCursor / 2), len, merged + yp);
+
+    for (x = len; x < columns; x++)
+        merged[yp + x] = dft;
+    for (x = 0; x < columns; x++) {
+        int p = x + yp; int q = x + yq;
+        if ( ( q >= sel_TL ) && ( q <= sel_BR ) )
+            reverseRendition(&merged[p]); // for selection
+    }
+  }
+
+  if (lines >= hist.getLines() - histCursor)  {
+      for (y = ( hist.getLines() - histCursor); y < lines ; y++)  {
+       int z = horzCursor;
+       int yp  = y * columns;
+       int yq  = ( y + histCursor) * columns;
+       int yr =  ( y - hist.getLines() + histCursor) * columns;
+//        qDebug("y %d, yp %d, yq %d, columns %d, z cursor %d", y,  yp, yq, columns, z);
+       for (x = 0; x < columns; x++) {
+           int p = x + yp; int q = x + yq; int r = (x + (horzCursor/2) ) + yr;
+           merged[p] = image[r];
+           if ( q >= sel_TL && q <= sel_BR )
+               reverseRendition( &merged[p]); // for selection
+       }
+    }
+ }
+
+      
+// evtl. inverse display
+  if (getMode(MODE_Screen))
+  { int i, n = lines * columns;
+    for (i = 0; i < n; i++)
+      reverseRendition( &merged[i]); // for reverse display
+  }
+  if (getMode(MODE_Cursor) && ( cuY + ( hist.getLines() - histCursor) < lines)) // cursor visible
+
+      reverseRendition( &merged[ loc( cuX, cuY + ( hist.getLines() - histCursor))] );
+
+  return merged;
+      */
+  
 }
 
 
@@ -556,7 +616,12 @@ ca* TEScreen::getCookedImage()
 
 void TEScreen::reset()
 {
+  Config cfg("Konsole");
+  cfg.setGroup("ScrollBar");
+  if( !cfg.readBoolEntry("HorzScroll",0) )
     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
@@ -658,12 +723,13 @@ void TEScreen::ShowCharacter(unsigned short c)
 
   if (cuX >= columns)
   {
-    if (getMode(MODE_Wrap)) NextLine(); else cuX = columns-1;
+    if (getMode(MODE_Wrap)) NextLine(); else cuX = columns - 1;
+       // comment out for no wrap
   }
 
   if (getMode(MODE_Insert)) insertChars(1);
 
-  int i = loc(cuX,cuY);
+  int i = loc( cuX, cuY);
 
   checkSelection(i, i); // check if selection is still valid.
 
@@ -685,10 +751,11 @@ void TEScreen::ShowCharacter(unsigned short c)
 
 void TEScreen::scrollUp(int from, int n)
 {
-  if (n <= 0 || from + n > bmargin) return;
+ if (n <= 0 || from + n > bmargin) return;
   //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds.
-  moveImage(loc(0,from),loc(0,from+n),loc(columns-1,bmargin));
-  clearImage(loc(0,bmargin-n+1),loc(columns-1,bmargin),' ');
+
+    moveImage( loc( 0, from), loc( 0, from + n), loc( columns - 1, bmargin));
+    clearImage( loc( 0, bmargin - n + 1), loc( columns - 1, bmargin), ' ');
 }
 
 /*! scroll down `n' lines within current region.
@@ -698,14 +765,18 @@ void TEScreen::scrollUp(int from, int n)
 
 void TEScreen::scrollDown(int from, int n)
 {
+    
 //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds.
-  if (n <= 0) return;
+ if (n <= 0) return;
   if (from > bmargin) return;
   if (from + n > bmargin) n = bmargin - from;
-  moveImage(loc(0,from+n),loc(0,from),loc(columns-1,bmargin-n));
+
+  moveImage( loc(0,from+n), loc(0,from), loc(columns-1,bmargin-n));
   clearImage(loc(0,from),loc(columns-1,from+n-1),' ');
 }
 
+
+
 /*! position the cursor to a specific line and column. */
 void TEScreen::setCursorYX(int y, int x)
 {
@@ -871,7 +942,7 @@ void TEScreen::clearToBeginOfLine()
 
 void TEScreen::clearEntireLine()
 {
-  clearImage(loc(0,cuY),loc(columns-1,cuY),' ');
+  clearImage( loc( 0, cuY),loc( columns - 1, cuY),' ');
 }
 
 // Rendition ------------------------------------------------------------------
@@ -988,17 +1059,17 @@ QString TEScreen::getSelText(const BOOL preserve_line_breaks)
   if (sel_begin == -1) 
      return QString::null; // Selection got clear while selecting.
 
-          int *m;               // buffer to fill.
-          int s, d;             // source index, dest. index.
+  int *m;     // buffer to fill.
+  int s, d;     // source index, dest. index.
   int hist_BR = loc(0, hist.getLines());
   int hY = sel_TL / columns;
   int hX = sel_TL % columns;
-          int eol;              // end of line
+  int eol;      // end of line
 
-          s = sel_TL;           // tracks copy in source.
+  s = sel_TL;     // tracks copy in source.
 
-                                // allocate buffer for maximum
-                                // possible size...
+        // allocate buffer for maximum
+        // possible size...
   d = (sel_BR - sel_TL) / columns + 1;
   m = new int[d * (columns + 1) + 2];
   d = 0;
@@ -1006,103 +1077,103 @@ QString TEScreen::getSelText(const BOOL preserve_line_breaks)
   while (s <= sel_BR)
     {
       if (s < hist_BR)
-                {               // get lines from hist.history
-                                // buffer.
-          eol = hist.getLineLen(hY);
-
-          if ((hY == (sel_BR / columns)) &&
-              (eol >= (sel_BR % columns)))
-            {
-              eol = sel_BR % columns + 1;
-            }
-          
-          while (hX < eol)
-            {
-              m[d++] = hist.getCell(hY, hX++).c;
-              s++;
-            }
-
-          if (s <= sel_BR)
-            {
-                                // The line break handling
-                                // It's different from the screen
-                                // image case!
-              if (eol % columns == 0)
-                {
-                                // That's either a completely filled
-                                // line or an empty line
-                  if (eol == 0)
-                    {
-                      m[d++] = '\n';
-                    }
-                  else
-                    {
-                                // We have a full line.
-                                // FIXME: How can we handle newlines
-                                // at this position?!
-                    }
-                }
-              else if ((eol + 1) % columns == 0)
-                {
-                                // FIXME: We don't know if this was a
-                                // space at the last position or a
-                                // short line!!
-                  m[d++] = ' ';
-                }
-              else
-                {
-                                // We have a short line here. Put a
-                                // newline or a space into the
-                                // buffer.
-                  m[d++] = preserve_line_breaks ? '\n' : ' ';
-                }
-            }
-
-          hY++;
-          hX = 0;
-          s = hY * columns;
-        }
+  {     // get lines from hist.history
+        // buffer.
+    eol = hist.getLineLen(hY);
+
+    if ((hY == (sel_BR / columns)) &&
+        (eol >= (sel_BR % columns)))
+      {
+        eol = sel_BR % columns + 1;
+      }
+    
+    while (hX < eol)
+      {
+        m[d++] = hist.getCell(hY, hX++).c;
+        s++;
+      }
+
+    if (s <= sel_BR)
+      {
+        // The line break handling
+        // It's different from the screen
+        // image case!
+        if (eol % columns == 0)
+    {
+        // That's either a completely filled
+        // line or an empty line
+      if (eol == 0)
+        {
+          m[d++] = '\n';
+        }
+      else
+        {
+        // We have a full line.
+        // FIXME: How can we handle newlines
+        // at this position?!
+        }
+    }
+        else if ((eol + 1) % columns == 0)
+    {
+        // FIXME: We don't know if this was a
+        // space at the last position or a
+        // short line!!
+      m[d++] = ' ';
+    }
+        else
+    {
+        // We have a short line here. Put a
+        // newline or a space into the
+        // buffer.
+      m[d++] = preserve_line_breaks ? '\n' : ' ';
+    }
+      }
+
+    hY++;
+    hX = 0;
+    s = hY * columns;
+  }
     else
-              {                         // or from screen image.
-        eol = (s / columns + 1) * columns - 1;
-
-        if (eol < sel_BR)
-          {
-            while ((eol > s) &&
-                   isspace(image[eol - hist_BR].c))
-              {
-                eol--;
-              }
-          }
-        else
-          {
-            eol = sel_BR;
-          }
-
-        while (s <= eol)
-          {
-            m[d++] = image[s++ - hist_BR].c;
-          }
-
-        if (eol < sel_BR)
-          {
-                                // eol processing see below ...
-            if ((eol + 1) % columns == 0)
-              {
-                if (image[eol - hist_BR].c == ' ')
-                  {
-                    m[d++] = ' ';
-                  }
-              }
-            else
-              {
-                m[d++] = ((preserve_line_breaks ||
-                           ((eol % columns) == 0)) ?
-                          '\n' : ' ');
-              }
-          }
-
-        s = (eol / columns + 1) * columns;
+      {       // or from screen image.
+  eol = (s / columns + 1) * columns - 1;
+
+  if (eol < sel_BR)
+    {
+      while ((eol > s) &&
+       isspace(image[eol - hist_BR].c))
+        {
+    eol--;
+        }
+    }
+  else
+    {
+      eol = sel_BR;
+    }
+
+  while (s <= eol)
+    {
+      m[d++] = image[s++ - hist_BR].c;
+    }
+
+  if (eol < sel_BR)
+    {
+        // eol processing see below ...
+      if ((eol + 1) % columns == 0)
+        {
+    if (image[eol - hist_BR].c == ' ')
+      {
+        m[d++] = ' ';
+      }
+        }
+      else
+        {
+    m[d++] = ((preserve_line_breaks ||
+         ((eol % columns) == 0)) ?
+        '\n' : ' ');
+        }
+    }
+
+  s = (eol / columns + 1) * columns;
       }
     }
 
@@ -1129,8 +1200,8 @@ cases:
    are preserved.
 
 FIXME:
-        * this suppresses \n for command output that is
-          sized to the exact column width of the screen.
+  * this suppresses \n for command output that is
+    sized to the exact column width of the screen.
 
 2)    eol%columns == 0     --> blank line.
    insert a \n unconditionally.
@@ -1138,7 +1209,7 @@ FIXME:
    or because it's an ASCII paragraph delimiter, so even when
    not preserving line_breaks, you want to preserve paragraph breaks.
 
-        3)    else       --> partially filled line
+3)    else     --> partially filled line
    insert a \n in preserve line break mode, else a space
    The space prevents concatenation of the last word of one
    line with the first of the next.
@@ -1152,18 +1223,18 @@ void TEScreen::addHistLine()
   // add to hist buffer
   // we have to take care about scrolling, too...
 
-  if (hasScroll())
-  { ca dft;
+  if (hasScroll()){
+      ca dft;
 
-    int end = columns-1;
+    int end = columns - 1;
     while (end >= 0 && image[end] == dft)
       end -= 1;
 
-    hist.addCells(image,end+1);
+    hist.addCells( image, end + 1);
     hist.addLine();
 
     // adjust history cursor
-    histCursor += (hist.getLines()-1 == histCursor);
+    histCursor += ( hist.getLines() - 1 == histCursor);
   }
 
   if (!hasScroll()) histCursor = 0; //FIXME: a poor workaround
@@ -1174,11 +1245,21 @@ void TEScreen::setHistCursor(int cursor)
   histCursor = cursor; //FIXME:rangecheck
 }
 
+void TEScreen::setHorzCursor(int cursor)
+{
+  horzCursor = cursor; 
+}
+
 int TEScreen::getHistCursor()
 {
   return histCursor;
 }
 
+int TEScreen::getHorzCursor()
+{
+  return horzCursor;
+}
+
 int TEScreen::getHistLines()
 {
   return hist.getLines();
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index b1ad008..c10c7a8 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -52,6 +52,13 @@
 #include "session.h"
 #include <qpe/config.h>
 
+#include <qpe/resource.h>
+#include <qpe/sound.h>
+
+#ifdef QWS
+#include <qpe/qcopenvelope_qws.h>
+#endif
+
 #include <qcursor.h>
 #include <qregexp.h>
 #include <qpainter.h>
@@ -287,6 +294,13 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
   scrollbar->setCursor( arrowCursor );
   connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
 
+  hScrollbar = new QScrollBar(this);
+  hScrollbar->setCursor( arrowCursor );
+  hScrollbar->setOrientation(QScrollBar::Horizontal);
+  hScrollbar->setMaximumHeight(16);
+  
+  connect( hScrollbar, SIGNAL(valueChanged(int)), this, SLOT( hScrollChanged(int)));
+
   Config cfg("Konsole");
   cfg.setGroup("ScrollBar");
   switch( cfg.readNumEntry("Position",2)){
@@ -301,6 +315,8 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
       break;
   };
 
+  useHorzScroll=cfg.readBoolEntry("HorzScroll",0);
+
   blinkT   = new QTimer(this);
   connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent()));
   // blinking = FALSE;
@@ -315,6 +331,7 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
   font_h   = 1;
   font_a   = 1;
   word_selection_mode = FALSE;
+  hposition = 0;
 
   setMouseMarks(TRUE);
   setVTFont( QFont("fixed") );
@@ -410,10 +427,7 @@ HCNT("setImage");
   int lins = QMIN(this->lines,  QMAX(0,lines  ));
   int cols = QMIN(this->columns,QMAX(0,columns));
   QChar *disstrU = new QChar[cols];
-
-//{ static int cnt = 0; printf("setImage %d\n",cnt++); }
-  for (y = 0; y < lins; y++)
-  {
+  for (y = 0; y < lins; y++) {
     const ca*       lcl = &image[y*this->columns];
     const ca* const ext = &newimg[y*columns];
     if (!resizing) // not while resizing, we're expecting a paintEvent
@@ -588,11 +602,18 @@ void TEWidget::propagateSize()
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
-void TEWidget::scrollChanged(int)
-{
+void TEWidget::scrollChanged(int) {
   emit changedHistoryCursor(scrollbar->value()); //expose
 }
 
+void TEWidget::hScrollChanged(int loc) {
+  hposition = loc;
+  propagateSize();
+  update();
+
+//  emit changedHorzCursor( hScrollbar->value()); //expose
+}
+
 void TEWidget::setScroll(int cursor, int slines)
 {
   disconnect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
@@ -697,6 +718,7 @@ void TEWidget::mouseMoveEvent(QMouseEvent* ev)
   int    tLx = tL.x();
   int    tLy = tL.y();
   int    scroll = scrollbar->value();
+//  int    hScroll = hScrollbar->value();
 
   // we're in the process of moving the mouse with the left button pressed
   // the mouse cursor will kept catched within the bounds of the text in
@@ -973,6 +995,10 @@ void TEWidget::doScroll(int lines)
   scrollbar->setValue(scrollbar->value()+lines);
 }
 
+void TEWidget::doHScroll(int lines) {
+  hScrollbar->setValue( hScrollbar->value()+lines);
+}
+
 bool TEWidget::eventFilter( QObject *obj, QEvent *e )
 {
     if ( (e->type() == QEvent::Accel ||
@@ -1078,7 +1104,17 @@ void TEWidget::frameChanged()
 
 void TEWidget::Bell()
 {
-  QApplication::beep();
+//#ifdef QT_QWS_CUSTOM
+//# ifndef QT_NO_COP
+    QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
+//# endif
+//#else
+//# ifndef QT_NO_SOUND
+//    QSound::play(Resource::findSound("alarm"));
+//# endif
+//#endif    
+
+//    QApplication::beep();
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1105,10 +1141,80 @@ void TEWidget::clearImage()
 
 void TEWidget::calcGeometry()
 {
-  //FIXME: set rimX == rimY == 0 when running in full screen mode.
+    int showhscrollbar = 1;
+    int hwidth = 0;
+    int dcolumns;
+    Config cfg("Konsole");
+    cfg.setGroup("ScrollBar");
+    useHorzScroll=cfg.readBoolEntry("HorzScroll",0);
+
+    if(vcolumns == 0) showhscrollbar = 0;
+    if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width();
+
+    scrollbar->resize(QApplication::style().scrollBarExtent().width(),
+                      contentsRect().height() - hwidth);
+
+    switch(scrollLoc)  {
+      case SCRNONE :
+          columns = ( contentsRect().width() - 2 * rimX ) / font_w;
+          dcolumns = columns;
+          if(vcolumns) columns = vcolumns;
+          blX = (contentsRect().width() - (columns*font_w) ) / 2;
+          if(showhscrollbar)
+              blX = -hposition * font_w;
+          brX = blX;
+          scrollbar->hide();
+          break;
+      case SCRLEFT :
+          columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w;
+          dcolumns = columns;
+          if(vcolumns) columns = vcolumns;
+          brX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2;
+          if(showhscrollbar)
+              brX = -hposition * font_w;
+          blX = brX + scrollbar->width();
+          scrollbar->move(contentsRect().topLeft());
+          scrollbar->show();
+          break;
+      case SCRRIGHT:
+          columns = ( contentsRect().width()  - 2 * rimX - scrollbar->width()) / font_w;
+          dcolumns = columns;
+          if(vcolumns) columns = vcolumns;
+          blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2;
+          if(showhscrollbar)
+              blX = -hposition * font_w;
+          brX = blX;
+          scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0));
+          scrollbar->show();
+          break;
+    }
+      //FIXME: support 'rounding' styles
+    lines   = ( contentsRect().height() - 2 * rimY  ) / font_h;
+    bY = (contentsRect().height() - (lines  *font_h)) / 2;
 
-  scrollbar->resize(QApplication::style().scrollBarExtent().width(),
+    if(showhscrollbar == 1)  {
+        hScrollbar->resize(contentsRect().width() - hwidth, hwidth);
+        hScrollbar->setRange(0, vcolumns - dcolumns);
+
+        QPoint p = contentsRect().bottomLeft();
+        hScrollbar->move(QPoint(p.x(), p.y() - hwidth));
+        hScrollbar->show();
+    }
+    else hScrollbar->hide();
+
+    if(showhscrollbar == 1)  {
+        lines = lines - (hwidth / font_h) - 1;
+        if(lines < 1) lines = 1;
+    }
+
+      /*//FIXME: set rimX == rimY == 0 when running in full screen mode.
+  Config cfg("Konsole");
+  cfg.setGroup("ScrollBar");
+  useHorzScroll=cfg.readBoolEntry("HorzScroll",0);
+
+  scrollbar->resize( QApplication::style().scrollBarExtent().width(),
                     contentsRect().height());
+  qDebug("font_w %d", font_w);
   switch(scrollLoc)
   {
     case SCRNONE :
@@ -1119,22 +1225,47 @@ void TEWidget::calcGeometry()
      break;
     case SCRLEFT :
      columns = ( contentsRect().width() - 2 * rimX - scrollbar->width()) / font_w;
+     if(useHorzScroll) columns = columns * (font_w/2);
      brX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2;
      blX = brX + scrollbar->width();
      scrollbar->move(contentsRect().topLeft());
      scrollbar->show();
      break;
     case SCRRIGHT:
-     columns = ( contentsRect().width()  - 2 * rimX - scrollbar->width()) / font_w;
-     blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2;
-     brX = blX;
-     scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0));
+      columns = ( contentsRect().width()  - 2 * rimX - scrollbar->width() ) / font_w;
+      if(useHorzScroll) columns = columns * (font_w/2);
+      blX = (contentsRect().width() - (columns*font_w) - scrollbar->width() ) / 2;
+      if(useHorzScroll) {
+          brX = blX =2;
+      } else {
+         brX=blX;
+      }
+     scrollbar->move(contentsRect().topRight() - QPoint(scrollbar->width()-1,0) );
      scrollbar->show();
      break;
   }
+
+   if( !scrollbar->isHidden())
+       hScrollbar->resize( contentsRect().width()-SCRWIDTH, QApplication::style()
+                      .scrollBarExtent().height());
+   else
+       hScrollbar->resize( contentsRect().width(), QApplication::style()
+                      .scrollBarExtent().height());
+
+   hScrollbar->move( 0, contentsRect().height() - SCRWIDTH);
+      
+
+  if(useHorzScroll) {
+      hScrollbar->show();
+      lines   = ( (contentsRect().height() - SCRWIDTH)  - 2 * rimY  ) / font_h;
+      bY = ((contentsRect().height() - SCRWIDTH) - (lines  *font_h)) / 2;
+  } else {
+      hScrollbar->hide();
+      lines   = (contentsRect().height()  - 2 * rimY  ) / font_h;
+      bY = (contentsRect().height() - (lines  *font_h)) / 2;
+  }     
+      */      
   //FIXME: support 'rounding' styles
-  lines   = ( contentsRect().height() - 2 * rimY  ) / font_h;
-  bY = (contentsRect().height() - (lines  *font_h)) / 2;
 }
 
 void TEWidget::makeImage()
@@ -1266,3 +1397,11 @@ void TEWidget::drop_menu_activated(int item)
 #endif
 }
 
+void TEWidget::setWrapAt(int columns)
+{
+  vcolumns = columns;
+    propagateSize();
+    update();
+}
+
+
diff --git a/core/apps/embeddedkonsole/TEWidget.h b/core/apps/embeddedkonsole/TEWidget.h
index 40e1aea..a480d45 100644
--- a/core/apps/embeddedkonsole/TEWidget.h
+++ b/core/apps/embeddedkonsole/TEWidget.h
@@ -60,7 +60,11 @@ public:
     void setScroll(int cursor, int lines);
     void doScroll(int lines);
 
+    void doHScroll(int lines);
+
+    
     void emitSelection();
+  void setWrapAt(int columns);
 
 public:
 
@@ -76,6 +80,7 @@ public:
     QSize sizeHint() const;
 
 public:
+    bool useHorzScroll;
 
     void Bell();
     void emitText(QString text);
@@ -87,6 +92,7 @@ signals:
     void mouseSignal(int cb, int cx, int cy);
     void changedImageSizeSignal(int lines, int columns);
     void changedHistoryCursor(int value);
+    void changedHorzCursor(int value);
     void configureRequest( TEWidget*, int state, int x, int y );
 
     void clearSelectionSignal();
@@ -96,7 +102,6 @@ signals:
 
 
 protected:
-
     virtual void styleChange( QStyle& );
 
     bool eventFilter( QObject *, QEvent * );
@@ -147,6 +152,7 @@ public slots:
 protected slots:
 
     void scrollChanged(int value);
+    void hScrollChanged(int value);
     void blinkEvent();
 
 private:
@@ -180,9 +186,12 @@ private:
     BOOL    preserve_line_breaks;
 
     QClipboard*    cb;
-    QScrollBar* scrollbar;
-    int         scrollLoc;
+    QScrollBar* scrollbar, *hScrollbar;
+    
+    int         scrollLoc, hScrollLoc;
+  int hposition, vcolumns;
 
+    
 //#define SCRNONE  0
 //#define SCRLEFT  1
 //#define SCRRIGHT 2
diff --git a/core/apps/embeddedkonsole/TEmulation.cpp b/core/apps/embeddedkonsole/TEmulation.cpp
index 6f3ad32..c19f2a1 100644
--- a/core/apps/embeddedkonsole/TEmulation.cpp
+++ b/core/apps/embeddedkonsole/TEmulation.cpp
@@ -9,11 +9,11 @@
 /* This file is part of Konsole - an X terminal for KDE                       */
 /*                                                                            */
 /* -------------------------------------------------------------------------- */
-        /*                                                                    */
+/*                        */
 /* Ported Konsole to Qt/Embedded                                              */
-        /*                                                                    */
+/*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
-        /*                                                                    */
+/*                        */
 /* -------------------------------------------------------------------------- */
 
 /*! \class TEmulation
@@ -103,20 +103,30 @@ TEmulation::TEmulation(TEWidget* gui)
   connected  = FALSE;
 
   QObject::connect(&bulk_timer, SIGNAL(timeout()), this, SLOT(showBulk()) );
+
   QObject::connect(gui,SIGNAL(changedImageSizeSignal(int,int)),
                    this,SLOT(onImageSizeChange(int,int)));
+
   QObject::connect(gui,SIGNAL(changedHistoryCursor(int)),
                    this,SLOT(onHistoryCursorChange(int)));
+
+  QObject::connect(gui,SIGNAL(changedHorzCursor(int)),
+                   this,SLOT(onHorzCursorChange(int)));
+
   QObject::connect(gui,SIGNAL(keyPressedSignal(QKeyEvent*)),
                    this,SLOT(onKeyPress(QKeyEvent*)));
+
   QObject::connect(gui,SIGNAL(beginSelectionSignal(const int,const int)),
-                   this,SLOT(onSelectionBegin(const int,const int)) );
+       this,SLOT(onSelectionBegin(const int,const int)) );
+
   QObject::connect(gui,SIGNAL(extendSelectionSignal(const int,const int)),
-                   this,SLOT(onSelectionExtend(const int,const int)) );
+       this,SLOT(onSelectionExtend(const int,const int)) );
+
   QObject::connect(gui,SIGNAL(endSelectionSignal(const BOOL)),
-                   this,SLOT(setSelection(const BOOL)) );
+       this,SLOT(setSelection(const BOOL)) );
+
   QObject::connect(gui,SIGNAL(clearSelectionSignal()),
-                   this,SLOT(clearSelection()) );
+       this,SLOT(clearSelection()) );
 }
 
 /*!
@@ -299,8 +309,10 @@ void TEmulation::showBulk()
                   scr->getLines(),
                   scr->getColumns());     // actual refresh
     free(image);
-    //FIXME: check that we do not trigger other draw event here.
+
+      //FIXME: check that we do not trigger other draw event here.
     gui->setScroll(scr->getHistCursor(),scr->getHistLines());
+
   }
 }
 
@@ -339,8 +351,7 @@ void TEmulation::setConnect(bool c)
     and to the related serial line.
 */
 
-void TEmulation::onImageSizeChange(int lines, int columns)
-{
+void TEmulation::onImageSizeChange(int lines, int columns) {
   if (!connected) return;
   screen[0]->resizeImage(lines,columns);
   screen[1]->resizeImage(lines,columns);
@@ -348,15 +359,19 @@ void TEmulation::onImageSizeChange(int lines, int columns)
   emit ImageSizeChanged(lines,columns);   // propagate event to serial line
 }
 
-void TEmulation::onHistoryCursorChange(int cursor)
-{
+void TEmulation::onHistoryCursorChange(int cursor) {
   if (!connected) return;
   scr->setHistCursor(cursor);
   showBulk();
 }
 
-void TEmulation::setColumns(int columns)
-{
+void TEmulation::onHorzCursorChange(int cursor) {
+  if (!connected) return;
+ scr->setHorzCursor(cursor);
+  showBulk();
+}
+
+void TEmulation::setColumns(int columns) {
   //FIXME: this goes strange ways.
   //       Can we put this straight or explain it at least?
   emit changeColumns(columns);
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index a8ddc99..3c87ad4 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -358,8 +358,20 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   scrollMenu->insertItem(tr( "None" ));
   scrollMenu->insertItem(tr( "Left" ));
   scrollMenu->insertItem(tr( "Right" ));
+  scrollMenu->insertSeparator(4);
+  scrollMenu->insertItem(tr( "Horizontal" ));
+ 
   configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
-
+//scrollMenuSelected(-29);
+//   cfg.setGroup("ScrollBar");
+//   if(cfg.readBoolEntry("HorzScroll",0)) {
+//       if(cfg.readNumEntry("Position",2) == 0)
+//           te->setScrollbarLocation(1);
+//       else
+//           te->setScrollbarLocation(0);
+//       te->setScrollbarLocation( cfg.readNumEntry("Position",2));
+//       te->setWrapAt(120);
+//   }
       // create applications /////////////////////////////////////////////////////
   setCentralWidget(tab);
 
@@ -372,7 +384,7 @@ void Konsole::init(const char* _pgm, QStrList & _args)
 
   se_pgm = _pgm;
   se_args = _args;
-
+  se_args.prepend("--login");
 parseCommandLine();
   // read and apply default values ///////////////////////////////////////////
   resize(321, 321); // Dummy.
@@ -508,6 +520,8 @@ QSize Konsole::calcSize(int columns, int lines) {
 
 void Konsole::setColLin(int columns, int lines)
 {
+  qDebug("konsole::setColLin:: Columns %d", columns);
+    
   if ((columns==0) || (lines==0))
   {
     if (defaultSize.isEmpty()) // not in config file : set default value
@@ -552,6 +566,7 @@ void Konsole::setFont(int fontno)
 
 void Konsole::changeColumns(int columns)
 {
+    qDebug("change columns");
   TEWidget* te = getTe();
   if (te != 0) {
   setColLin(columns,te->Lines());
@@ -800,8 +815,7 @@ void Konsole::setColor()
 
 void Konsole::scrollMenuSelected(int index)
 {
-//      QString temp;
-//      qDebug( temp.sprintf("scrollbar menu %d",index));
+    qDebug( "scrollbar menu %d",index);
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
@@ -818,6 +832,18 @@ void Konsole::scrollMenuSelected(int index)
         te->setScrollbarLocation(2);
         cfg.writeEntry("Position",2);
         break;
+      case -29: {
+          bool b=cfg.readBoolEntry("HorzScroll",0);
+          cfg.writeEntry("HorzScroll", !b );
+          cfg.write();
+          if(cfg.readNumEntry("Position",2) == 0)
+              te->setScrollbarLocation(1);
+          else
+              te->setScrollbarLocation(0);
+          te->setScrollbarLocation( cfg.readNumEntry("Position",2));
+          te->setWrapAt(120);
+      }
+        break;
     };
 
 }