1 files changed, 15 insertions, 11 deletions

diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp
index 1c83710..3d010cb 100644
--- a/noncore/apps/opie-console/TEWidget.cpp
+++ b/noncore/apps/opie-console/TEWidget.cpp
@@ -1027,316 +1027,320 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
           e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this )  {
         static_cast<QKeyEvent *>( e )->ignore();
         return true;
     }
     if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
         return FALSE; // not us
     if ( e->type() == QEvent::Wheel)  {
         QApplication::sendEvent(scrollbar, e);
     }
 
 #ifdef FAKE_CTRL_AND_ALT
     static bool control = FALSE;
     static bool alt = FALSE;
 //    qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:");
     bool dele=FALSE;
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent* ke = (QKeyEvent*)e;
         bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat();
         switch (ke->key()) {
           case Key_F9: // let this be "Control"
               control = keydown;
               e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state());
               dele=TRUE;
               break;
           case Key_F13: // let this be "Alt"
               alt = keydown;
               e = new QKeyEvent(QEvent::KeyPress, Key_Alt, 0, ke->state());
               dele=TRUE;
               break;
           default:
               if ( control ) {
                   int a = toupper(ke->ascii())-64;
                   if ( a >= 0 && a < ' ' ) {
                       e = new QKeyEvent(e->type(), ke->key(),
                                         a, ke->state()|ControlButton, QChar(a,0));
                       dele=TRUE;
                   }
               }
               if ( alt ) {
                   e = new QKeyEvent(e->type(), ke->key(),
                                     ke->ascii(), ke->state()|AltButton, ke->text());
                   dele=TRUE;
               }
         }
     }
 #endif
 
     if ( e->type() == QEvent::KeyPress )  {
         QKeyEvent* ke = (QKeyEvent*)e;
         actSel=0; // Key stroke implies a screen update, so TEWidget won't
           // know where the current selection is.
 
 //     qDebug("key pressed is 0x%x",ke->key());
 
         if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
 
 //     qDebug("key pressed 2 is 0x%x",ke->key());
             emitText("\\"); // expose
         } else
             emit keyPressedSignal(ke); // expose
         ke->accept();
 #ifdef FAKE_CTRL_AND_ALT
         if ( dele ) delete e;
 #endif
         return true;               // stop the event
     }
     if ( e->type() == QEvent::Enter )  {
         QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()),
                              this, SLOT(onClearSelection()) );
     }
     if ( e->type() == QEvent::Leave )  {
         QObject::connect( (QObject*)cb, SIGNAL(dataChanged()),
                           this, SLOT(onClearSelection()) );
     }
     return QFrame::eventFilter( obj, e );
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                  Frame                                    */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 void TEWidget::frameChanged()
 {
   propagateSize();
   update();
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                   Sound                                   */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 void TEWidget::Bell()
 {
   QApplication::beep();
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                 Auxiluary                                 */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 void TEWidget::clearImage()
 // initialize the image
 // for internal use only
 {
   for (int y = 0; y < lines; y++)
   for (int x = 0; x < columns; x++)
   {
     image[loc(x,y)].c = 0xff; //' ';
     image[loc(x,y)].f = 0xff; //DEFAULT_FORE_COLOR;
     image[loc(x,y)].b = 0xff; //DEFAULT_BACK_COLOR;
     image[loc(x,y)].r = 0xff; //DEFAULT_RENDITION;
   }
 }
 
 // Create Image ///////////////////////////////////////////////////////
 
 void TEWidget::calcGeometry()
 {
   //FIXME: set rimX == rimY == 0 when running in full screen mode.
 
   int showhscrollbar = 1;
   int hwidth = 0;
+  int dcolumns;
 
   if(vcolumns == 0) showhscrollbar = 0;
   if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width();
 
   scrollbar->resize(QApplication::style().scrollBarExtent().width(),
                     contentsRect().height() - hwidth);
 
   if(!showhscrollbar) cornerButton()->move(0, 0);
   else cornerButton()->move(contentsRect().width() - hwidth, contentsRect().height() - hwidth);
 
 
-  if(showhscrollbar == 1)
-  {
-    hscrollbar->resize(contentsRect().width() - hwidth, hwidth);
-    hscrollbar->setRange(0, 40);
-
-    QPoint p = contentsRect().bottomLeft();
-    hscrollbar->move(QPoint(p.x(), p.y() - hwidth));
-    hscrollbar->show();
-  }
-  else hscrollbar->hide();
-
   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;
 
   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;
   }
 }
 
 void TEWidget::makeImage()
 //FIXME: rename 'calcGeometry?
 {
   calcGeometry();
   image = (ca*) malloc(lines*columns*sizeof(ca));
   clearImage();
 }
 
 // calculate the needed size
 QSize TEWidget::calcSize(int cols, int lins) const
 {
   int frw = width() - contentsRect().width();
   int frh = height() - contentsRect().height();
   int scw = (scrollLoc==SCRNONE?0:scrollbar->width());
   return QSize( font_w*cols + 2*rimX + frw + scw, font_h*lins + 2*rimY + frh );
 }
 
 QSize TEWidget::sizeHint() const
 {
    return size();
 }
 
 void TEWidget::styleChange(QStyle &)
 {
     propagateSize();
 }
 
 #ifndef QT_NO_DRAGANDDROP
 
 /* --------------------------------------------------------------------- */
 /*                                                                       */
 /* Drag & Drop                                                           */
 /*                                                                       */
 /* --------------------------------------------------------------------- */
 
 
 void TEWidget::dragEnterEvent(QDragEnterEvent* e)
 {
   e->accept(QTextDrag::canDecode(e) ||
       QUriDrag::canDecode(e));
 }
 
 void TEWidget::dropEvent(QDropEvent* event)
 {
     // The current behaviour when url(s) are dropped is
     // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd
     // * in all other cases, just paste
     //   (for non-local ones, or for a list of URLs, 'cd' is nonsense)
   QStrList strlist;
   int file_count = 0;
   dropText = "";
   bool bPopup = true;
 
   if(QUriDrag::decode(event, strlist)) {
     if (strlist.count()) {
       for(const char* p = strlist.first(); p; p = strlist.next()) {
         if(file_count++ > 0) {
           dropText += " ";
           bPopup = false; // more than one file, don't popup
         }
 
 /*
         KURL url(p);
         if (url.isLocalFile()) {
           dropText += url.path(); // local URL : remove protocol
         }
         else {
           dropText += url.prettyURL();
           bPopup = false; // a non-local file, don't popup
         }
 */
 
       }
 
       if (bPopup)
         // m_drop->popup(pos() + event->pos());
   m_drop->popup(mapToGlobal(event->pos()));
       else
   {
     if (currentSession) {
       currentSession->getEmulation()->sendString(dropText.local8Bit());
     }
 //    kdDebug() << "Drop:" << dropText.local8Bit() << "\n";
   }
     }
   }
   else if(QTextDrag::decode(event, dropText)) {
 //    kdDebug() << "Drop:" << dropText.local8Bit() << "\n";
     if (currentSession) {
       currentSession->getEmulation()->sendString(dropText.local8Bit());
     }
     // Paste it
   }
 }
 #endif
 
 
 void TEWidget::drop_menu_activated(int)
 {
 #ifndef QT_NO_DRAGANDDROP
   switch (item)
   {
     case 0: // paste
       currentSession->getEmulation()->sendString(dropText.local8Bit());
 //    KWM::activate((Window)this->winId());
       break;
     case 1: // cd ...
       currentSession->getEmulation()->sendString("cd ");
       struct stat statbuf;
       if ( ::stat( QFile::encodeName( dropText ), &statbuf ) == 0 )
       {
         if ( !S_ISDIR(statbuf.st_mode) )
         {
 /*
           KURL url;
           url.setPath( dropText );
           dropText = url.directory( true, false ); // remove filename
 */
         }
       }
       dropText.replace(QRegExp(" "), "\\ "); // escape spaces
       currentSession->getEmulation()->sendString(dropText.local8Bit());
       currentSession->getEmulation()->sendString("\n");