6 files changed, 62 insertions, 19 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
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
@@ -131,32 +131,38 @@ public: // these are all `Screen' operations
     void clear();
     void home();
     void reset();
     //
     void ShowCharacter(unsigned short c);
     //
     void resizeImage(int new_lines, int new_columns);
     //
     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();
 
     //
     // Selection
     //
     void setSelBeginXY(const int x, const int y);
     void setSelExtentXY(const int x, const int y);
     void clearSelection();
     QString getSelText(const BOOL preserve_line_breaks);
 
@@ -191,24 +197,26 @@ private:
 
     // screen image ----------------
 
     int lines;
     int columns;
     ca *image; // [lines][columns]
 
     // history buffer ---------------
 
     int histCursor;   // display position relative to start of the history buffer
     HistoryScroll hist;
     
+    int horzCursor;
+    
     // cursor location
 
     int cuX;
     int cuY;
 
     // cursor color and rendition info
 
     UINT8 cu_fg;      // foreground
     UINT8 cu_bg;      // background
     UINT8 cu_re;      // rendition
 
     // margins ----------------
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
@@ -323,24 +323,25 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
   blinking = TRUE;
 
   resizing = FALSE;
   actSel   = 0;
   image    = 0;
   lines    = 1;
   columns  = 1;
   font_w   = 1;
   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
 
   qApp->installEventFilter( this ); //FIXME: see below
 //  KCursor::setAutoHideCursor( this, true );
 
   // Init DnD ////////////////////////////////////////////////////////////////
   currentSession = NULL;
 //  setAcceptDrops(true); // attempt
 //  m_drop = new QPopupMenu(this);
@@ -1394,14 +1395,12 @@ void TEWidget::drop_menu_activated(int item)
 //    KWM::activate((Window)this->winId());
       break;
   }
 #endif
 }
 
 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
@@ -33,24 +33,25 @@ public:
 
   TEmulation(TEWidget* gui);
   ~TEmulation();
 
 public:
   virtual void setHistory(bool on);
   virtual bool history();
 
 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);
   virtual void onSelectionExtend(const int x, const int y);
   virtual void setSelection(const BOOL preserve_line_breaks);
 
 public slots: // signals incoming from data source
 
   void onRcvBlock(const char* txt,int len);
 
 signals:
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
@@ -349,28 +349,31 @@ void Konsole::init(const char* _pgm, QStrList & _args)
 //   for (int i = 0; commonCmds[i] != NULL; i++) {
 //        commonCombo->insertItem( commonCmds[i], i );
 //        tmp = cfg.readEntry( QString::number(i),"");
 //        if(tmp != "")
 //            commonCombo->changeItem( tmp,i );
 //    }
 
   connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) ));
 
   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)
 //           te->setScrollbarLocation(1);
 //       else
 //           te->setScrollbarLocation(0);
 //       te->setScrollbarLocation( cfg.readNumEntry("Position",2));
 //       te->setWrapAt(120);
 //   }
       // create applications /////////////////////////////////////////////////////
   setCentralWidget(tab);
@@ -390,24 +393,25 @@ parseCommandLine();
   resize(321, 321); // Dummy.
   QSize currentSize = size();
   if (currentSize != size())
      defaultSize = size();
 }
 
 void Konsole::show()
 {
   if ( !nsessions ) {
     newSession();
   }
   QMainWindow::show();
+  
 }
 
 void Konsole::initSession(const char*, QStrList &)
 {
   QMainWindow::show();
 }
 
 Konsole::~Konsole()
 {
     while (nsessions > 0) {
       doneSession(getTe()->currentSession, 0);
      }
@@ -599,24 +603,25 @@ void Konsole::newSession() {
         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++;
+        doWrap();
     setColor();
     }
 }
 
 TEWidget* Konsole::getTe() {
   if (nsessions) {
     return (TEWidget *) tab->currentPage();
   } else {
     return 0;
   }
 }
 
@@ -764,43 +769,57 @@ void Konsole::colorMenuSelected(int iD)
             else
                 m_table[i].color = defaultCt[i].color;
         }
     }
     lastSelectedMenu = iD;
     te->setColorTable(m_table);
     update();
 
 }
 
 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) {
         cfg.setGroup("Tabs");
         QString tmp=cfg.readEntry("Position","Bottom");
 
         if(tmp=="Top") {
             tab->setTabPosition(QTabWidget::Bottom);
             configMenu->changeItem( iD,"Tabs on Top");
             cfg.writeEntry("Position","Bottom");
         } else {
             tab->setTabPosition(QTabWidget::Top);
             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)
 {
     Config cfg("Konsole");
     cfg.setGroup("Commands");
     if(commonCmds[c] != text) {
         cfg.writeEntry(QString::number(c),text);
         commonCombo->clearEdit();
         commonCombo->setCurrentItem(c);
     }
 }
@@ -823,38 +842,39 @@ void Konsole::scrollMenuSelected(int index)
     case -25:
         te->setScrollbarLocation(0);
         cfg.writeEntry("Position",0);
         break;
     case -26:
         te->setScrollbarLocation(1);
         cfg.writeEntry("Position",1);
         break;
     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)
 {
 //      QString temp;
 //      qDebug( temp.sprintf("edit command list %d",iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
     if( iD  == -3) {
         if(!secondToolBar->isHidden()) {
             secondToolBar->hide();
@@ -962,12 +982,26 @@ void Konsole::changeBackgroundColor(const QColor &color) {
 
     qDebug("Change background");
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     background.setRgb(r,g,b);
 //     QString colors;
 //     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
@@ -72,24 +72,25 @@ private slots:
   void hitUp();
   void hitDown();
   void switchSession(QWidget *);
   void newSession();
   void changeCommand(const QString &, int);
   void initCommandList();
   void scrollMenuSelected(int);
   void editCommandListMenuSelected(int);
   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();
   void setHistory(bool);
   QSize calcSize(int columns, int lines);
   TEWidget* getTe();
   QStringList commands;
   QLabel * msgLabel;
   QColor foreground, background;
 bool fromMenu;
 private: