no wrap and horz scroll should work, thanks to console

6 files changed, 83 insertions, 40 deletions

diff --git a/core/apps/embeddedkonsole/TEHistory.h b/core/apps/embeddedkonsole/TEHistory.h
index 8339ec6..11eb150 100644
--- a/core/apps/embeddedkonsole/TEHistory.h
+++ b/core/apps/embeddedkonsole/TEHistory.h
@@ -8,13 +8,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>                  */
-        /*                                                                    */
+/*                        */
 /* -------------------------------------------------------------------------- */
 
 #ifndef TEHISTORY_H
 #define TEHISTORY_H
diff --git a/core/apps/embeddedkonsole/TEScreen.h b/core/apps/embeddedkonsole/TEScreen.h
index ba47ee5..a28f7c5 100644
--- a/core/apps/embeddedkonsole/TEScreen.h
+++ b/core/apps/embeddedkonsole/TEScreen.h
@@ -8,13 +8,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>                  */
-        /*                                                                    */
+/*                        */
 /* -------------------------------------------------------------------------- */
 
 #ifndef TESCREEN_H
 #define TESCREEN_H
@@ -139,16 +139,22 @@ public: // these are all `Screen' operations
     ca*  getCookedImage();
     
     /*! return the number of lines. */
     int  getLines()   { return lines; }
+
     /*! return the number of columns. */
     int  getColumns() { return columns; }
 
     /*! set the position of the history cursor. */
     void setHistCursor(int cursor);
     /*! return the position of the history cursor. */
     int  getHistCursor();
 
+    /*! set the position of the horizontal cursor. */
+    void setHorzCursor(int cursor);
+    /*! return the position of the horizontal cursor. */
+    int  getHorzCursor();
+
     int  getHistLines ();
     void setScroll(bool on);
     bool hasScroll();
 
@@ -198,8 +204,10 @@ private:
     // history buffer ---------------
 
     int histCursor;   // display position relative to start of the history buffer
     HistoryScroll hist;
+
+    int horzCursor;
     
     // cursor location
 
     int cuX;
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index c10c7a8..60021f4 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -331,9 +331,10 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
   font_h   = 1;
   font_a   = 1;
   word_selection_mode = FALSE;
   hposition = 0;
-
+vcolumns = 0;
+ 
   setMouseMarks(TRUE);
   setVTFont( QFont("fixed") );
   setColorTable(base_color_table); // init color table
 
@@ -1402,6 +1403,4 @@ void TEWidget::setWrapAt(int columns)
   vcolumns = columns;
     propagateSize();
     update();
 }
-
-
diff --git a/core/apps/embeddedkonsole/TEmulation.h b/core/apps/embeddedkonsole/TEmulation.h
index ec15e7a..bf43f11 100644
--- a/core/apps/embeddedkonsole/TEmulation.h
+++ b/core/apps/embeddedkonsole/TEmulation.h
@@ -8,13 +8,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>                  */
-        /*                                                                    */
+/*                        */
 /* -------------------------------------------------------------------------- */
 
 #ifndef EMULATION_H
 #define EMULATION_H
@@ -41,8 +41,9 @@ public:
 public slots: // signals incoming from TEWidget
 
   virtual void onImageSizeChange(int lines, int columns);
   virtual void onHistoryCursorChange(int cursor);
+  virtual void onHorzCursorChange(int cursor);
   virtual void onKeyPress(QKeyEvent*);
  
   virtual void clearSelection();
   virtual void onSelectionBegin(const int x, const int y);
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 3c87ad4..16db0ea 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -357,12 +357,15 @@ 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" ));
+//   scrollMenu->insertSeparator(4);
+//   scrollMenu->insertItem(tr( "Horizontal" ));
  
   configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
+
+  configMenu->insertItem(tr( "Wrap" ));
+  
 //scrollMenuSelected(-29);
 //   cfg.setGroup("ScrollBar");
 //   if(cfg.readBoolEntry("HorzScroll",0)) {
 //       if(cfg.readNumEntry("Position",2) == 0)
@@ -398,8 +401,9 @@ void Konsole::show()
   if ( !nsessions ) {
     newSession();
   }
   QMainWindow::show();
+  
 }
 
 void Konsole::initSession(const char*, QStrList &)
 {
@@ -597,19 +601,20 @@ void Konsole::doneSession(TESession*, int )
 void Konsole::newSession() {
     if(nsessions < 15) {    // seems to be something weird about 16 tabs on the Zaurus.... memory?
         TEWidget* te = new TEWidget(tab);
 //  te->setBackgroundMode(PaletteBase); //we want transparent!!
-    te->setVTFont(fonts.at(cfont)->getFont());
-    tab->addTab(te);
-    TESession* se = new TESession(this, te, se_pgm, se_args, "xterm");
-    te->currentSession = se;
-    connect( se, SIGNAL(done(TESession*,int)), this, SLOT(doneSession(TESession*,int)) );
-    se->run();
-    se->setConnect(TRUE);
-    se->setHistory(b_scroll);
-    tab->setCurrentPage(nsessions);
-    nsessions++;
-    setColor();
+        te->setVTFont(fonts.at(cfont)->getFont());
+        tab->addTab(te);
+        TESession* se = new TESession(this, te, se_pgm, se_args, "xterm");
+        te->currentSession = se;
+        connect( se, SIGNAL(done(TESession*,int)), this, SLOT(doneSession(TESession*,int)) );
+        se->run();
+        se->setConnect(TRUE);
+        se->setHistory(b_scroll);
+        tab->setCurrentPage(nsessions);
+        nsessions++;
+        doWrap();
+        setColor();
     }
 }
 
 TEWidget* Konsole::getTe() {
@@ -772,10 +777,10 @@ void Konsole::colorMenuSelected(int iD)
 }
 
 void Konsole::configMenuSelected(int iD)
 {
-//        QString temp;
-//        qDebug( temp.sprintf("configmenu %d",iD));
+        QString temp;
+        qDebug( temp.sprintf("configmenu %d",iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
     if( iD  == -4) {
@@ -791,8 +796,22 @@ void Konsole::configMenuSelected(int iD)
             configMenu->changeItem( iD,"Tabs on Bottom");
             cfg.writeEntry("Position","Top");
         }
     }
+    if( iD  == -29) {
+    cfg.setGroup("ScrollBar");
+          bool b=cfg.readBoolEntry("HorzScroll",0);
+          b=!b;
+          cfg.writeEntry("HorzScroll", b );
+          cfg.write();
+          doWrap();
+          if(cfg.readNumEntry("Position",2) == 0) {
+              te->setScrollbarLocation(1);
+          } else {
+              te->setScrollbarLocation(0);
+          }
+          te->setScrollbarLocation( cfg.readNumEntry("Position",2));
+    }   
 }
 
 void Konsole::changeCommand(const QString &text, int c)
 {
@@ -831,22 +850,23 @@ void Konsole::scrollMenuSelected(int index)
     case -27:
         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;
+//       case -29: {
+//           bool b=cfg.readBoolEntry("HorzScroll",0);
+//           cfg.writeEntry("HorzScroll", !b );
+//           cfg.write();
+//           if(cfg.readNumEntry("Position",2) == 0) {
+//               te->setScrollbarLocation(1);
+//           te->setWrapAt(0);
+//           } else {
+//               te->setScrollbarLocation(0);
+//           te->setWrapAt(120);
+//           }
+//           te->setScrollbarLocation( cfg.readNumEntry("Position",2));
+//       }
+//         break;
     };
-
 }
 
 void Konsole::editCommandListMenuSelected(int iD)
 {
@@ -970,4 +990,18 @@ void Konsole::changeBackgroundColor(const QColor &color) {
 //     colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
     cfg.writeEntry("background",color.name());
     cfg.write();
 }
+
+void Konsole::doWrap() {
+    Config cfg("Konsole");
+    cfg.setGroup("ScrollBar");
+    TEWidget* te = getTe();
+    if( !cfg.readBoolEntry("HorzScroll",0)) {
+        te->setWrapAt(0);
+        configMenu->setItemChecked(-29,FALSE);
+    } else {
+        te->setWrapAt(90);
+//        te->setWrapAt(120);
+        configMenu->setItemChecked(-29,TRUE);
+    }       
+}
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h
index 0bf3fb3..4938159 100644
--- a/core/apps/embeddedkonsole/konsole.h
+++ b/core/apps/embeddedkonsole/konsole.h
@@ -80,8 +80,9 @@ private slots:
   void parseCommandLine();
     void changeForegroundColor(const QColor &);
     void changeBackgroundColor(const QColor &);
 private:
+    void doWrap();
   void init(const char* _pgm, QStrList & _args);
   void initSession(const char* _pgm, QStrList & _args);
   void runSession(TESession* s);
   void setColorPixmaps();