2 files changed, 63 insertions, 66 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index 350ab3a..0cd7ed1 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -824,64 +824,65 @@ void TEWidget::mouseDoubleClickEvent(QMouseEvent* ev)
   QPoint bgnSel = pos;
   QPoint endSel = QPoint((ev->x()-tLx-blX)/font_w,(ev->y()-tLy-bY)/font_h);
   int i = loc(bgnSel.x(),bgnSel.y());
   iPntSel = bgnSel;
 
   word_selection_mode = TRUE;
 
   // find word boundaries...
   int selClass = charClass(image[i].c);
   {
     // set the start...
      int x = bgnSel.x();
      while ( x > 0 && charClass(image[i-1].c) == selClass )
      { i--; x--; }
      bgnSel.setX(x);
      emit beginSelectionSignal( bgnSel.x(), bgnSel.y() );
 
      // set the end...
      i = loc( endSel.x(), endSel.y() );
      x = endSel.x();
      while( x < columns-1 && charClass(image[i+1].c) == selClass )
      { i++; x++ ; }
      endSel.setX(x);
      actSel = 2; // within selection
      emit extendSelectionSignal( endSel.x(), endSel.y() );
      emit endSelectionSignal(preserve_line_breaks);
      preserve_line_breaks = TRUE;
    }
 }
 
 void TEWidget::focusInEvent( QFocusEvent * )
 {
+    
     // do nothing, to prevent repainting
 }
 
 
 void TEWidget::focusOutEvent( QFocusEvent * )
 {
     // do nothing, to prevent repainting
 }
 
 bool TEWidget::focusNextPrevChild( bool next )
 {
   if (next)
     return false; // This disables changing the active part in konqueror
                   // when pressing Tab
   return QFrame::focusNextPrevChild( next );
 }
 
 
 int TEWidget::charClass(char ch) const
 {
     // This might seem like overkill, but imagine if ch was a Unicode
     // character (Qt 2.0 QChar) - it might then be sensible to separate
     // the different language ranges, etc.
 
     if ( isspace(ch) ) return ' ';
 
     static const char *word_characters = ":@-./_~";
     if ( isalnum(ch) || strchr(word_characters, ch) )
     return 'a';
 
     // Everything else is weird
     return 1;
@@ -945,143 +946,138 @@ void TEWidget::setSelection(const QString& t)
 void TEWidget::onClearSelection()
 {
   emit clearSelectionSignal();
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                Keyboard                                   */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 //FIXME: an `eventFilter' has been installed instead of a `keyPressEvent'
 //       due to a bug in `QT' or the ignorance of the author to prevent
 //       repaint events being emitted to the screen whenever one leaves
 //       or reenters the screen to/from another application.
 //
 //   Troll says one needs to change focusInEvent() and focusOutEvent(),
 //   which would also let you have an in-focus cursor and an out-focus
 //   cursor like xterm does.
 
 // for the auto-hide cursor feature, I added empty focusInEvent() and
 // focusOutEvent() so that update() isn't called.
 // For auto-hide, we need to get keypress-events, but we only get them when
 // we have focus.
 
 void TEWidget::doScroll(int lines)
 {
   scrollbar->setValue(scrollbar->value()+lines);
 }
 
 bool TEWidget::eventFilter( QObject *obj, QEvent *e )
 {
-  if ( (e->type() == QEvent::Accel ||
-       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);
-  }
+    if ( (e->type() == QEvent::Accel ||
+          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;
+        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;
+              }
         }
     }
-    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();
+    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;
+        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 );
+        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()
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp
index e3ba346..b3c0453 100644
--- a/core/apps/embeddedkonsole/main.cpp
+++ b/core/apps/embeddedkonsole/main.cpp
@@ -9,52 +9,53 @@
 /* This file is part of Konsole, an X terminal.                           */
 /*                                                                        */
 /* The material contained in here more or less directly orginates from    */
 /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */
 /*                                                                        */
 /* ---------------------------------------------------------------------- */
         /*                                                                    */
 /* Ported Konsole to Qt/Embedded                                              */
         /*                                                                    */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
         /*                                                                    */
 /* -------------------------------------------------------------------------- */
 
 #include "konsole.h"
 
 #include <qpe/qpeapplication.h>
 
 #include <qfile.h>
 
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 
 /* --| main |------------------------------------------------------ */
 int main(int argc, char* argv[])
 {
   setuid(getuid()); setgid(getgid()); // drop privileges
 
   QPEApplication a( argc, argv );
 
 #ifdef FAKE_CTRL_AND_ALT
+    qDebug("Fake Ctrl and Alt defined");
   QPEApplication::grabKeyboard(); // for CTRL and ALT
 #endif
 
   QStrList tmp;
   const char* shell = getenv("SHELL");
   if (shell == NULL || *shell == '\0')
     shell = "/bin/sh";
 
   // sh is completely broken on familiar. Let's try to get something better
   if ( qstrcmp( shell, "/bin/shell" ) == 0 && QFile::exists( "/bin/bash" ) )
       shell = "/bin/bash";
   
   putenv((char*)"COLORTERM="); // to trigger mc's color detection
 
   Konsole m( "test", shell, tmp, TRUE  );
   m.setCaption( Konsole::tr("Terminal") );
   a.showMainWidget( &m );
 
   return a.exec();
 }