merged changes form qkonsole back into opie-embeddedkonsole (most likely not bugfree !)

1 files changed, 85 insertions, 25 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index ec1b30c..98c3cdf 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -68,2 +68,3 @@
 #include <qdragobject.h>
+#include <qnamespace.h>
 
@@ -246,14 +247,8 @@ void TEWidget::fontChange(const QFont &)
   font_h = fm.height();
-
-    // font_w = max width of ASCII chars (U.B.)
-        font_w = 0;
-        int fw;
-        for (int i = 0x20; i < 0x80; i++) {
-                        if (isprint(i) && font_w < (fw = fm.width(i))) {
-                                        font_w = fw;
-                        }
-        }
                 //font_w = fm.maxWidth();
-
+  font_w = fm.width("m");
         font_a = fm.ascent();
+  printf("font h=%d max_width=%d width_m=%d assent=%d\n", font_h,
+         fm.maxWidth(), font_w, font_a);
+
 //printf("font_h: %d\n",font_h);
@@ -309,3 +304,3 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
   hScrollbar->setOrientation(QScrollBar::Horizontal);
-  hScrollbar->setMaximumHeight(16);
+  //  hScrollbar->setMaximumHeight(16);
 
@@ -313,3 +308,3 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
 
-  Config cfg("Konsole");
+  Config cfg("Qkonsole");
   cfg.setGroup("ScrollBar");
@@ -686,3 +681,4 @@ void TEWidget::mousePressEvent(QMouseEvent* ev)
 
-  word_selection_mode = FALSE;
+  mouse_down_x = ev->x();
+  mouse_down_y = ev->y();
 
@@ -693,2 +689,4 @@ void TEWidget::mousePressEvent(QMouseEvent* ev)
 
+    word_selection_mode = (ev->state() & ShiftButton);
+
     if ( ev->state() & ControlButton ) preserve_line_breaks = FALSE ;
@@ -817,2 +815,8 @@ void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
   {
+    if (QABS(ev->x() - mouse_down_x) < 3 
+        && QABS(ev->y() - mouse_down_y) < 3
+        && ev->y() < qApp->desktop()->height()/8) {
+      emit setFullScreen(false);
+    }
+
     if ( actSel > 1 ) emit endSelectionSignal(preserve_line_breaks);
@@ -1032,3 +1036,2 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
     bool dele=FALSE;
-                
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
@@ -1071,16 +1074,75 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
 //     qDebug("key pressed is 0x%x, ascii is 0x%x, state %d", ke->key(), ke->ascii(), ke->state());
-                                if(ke->key() == Key_Escape) {
-     qDebug("key pressed is 0x%x, ascii is 0x%x, state %d", ke->key(), ke->ascii(), ke->state());
         
+        bool special_function = true;
+        switch(ke->key()) {
+                  //case 0x201b:  // fn-5
+                  //case Key_F1:
+          // switch sessions (?)
+          // emitText("\\"); // expose  (??)
+                  //  break;
+
+        case 0x2016:  // fn-p
+        case Key_F2:
+          pasteClipboard();
+          break;
+
+        case 0x2018:  // fn-S
+        case Key_F3:
+          emit changeSession(1);
+          break;
+
+        case 0x2019: // fn-n
+          emit newSession();
+          break;
+
+        case Qt::Key_Tab:
+          if (ke->state() == ControlButton) {
+            emit changeSession(1);
+          } else {
+            special_function = false;
+          }
+          break;
+
+#if 0
+        case Qt::Key_Left:
+          if (vcolumns == 0) {
+            emit changeSession(-1);
+          } else {
+            special_function = false;
+          }
+          break;
+
+        case Qt::Key_Right:
+          if (vcolumns == 0) {
+            emit changeSession(1);
+          } else {
+            special_function = false;
                                 }
+          break;
+#endif
                                 
-        if( ke->state() == ShiftButton && ke->key() == Key_Tab) {
-          //lets hardcode this sucker
+        case 0x201b:  // fn-5
+        case Key_F4:
+          emit toggleFullScreen();
+          break;
+
+        case 0x200f:  // fn-1 magnify minus
+        case Key_F5:
+          emit changeFontSize(-1);
+          break;
 
-//     qDebug("key pressed 2 is 0x%x", ke->key());
-            emitText("\\"); // expose
+        case 0x2010:  // fn-2 magnify plus
+        case Key_F6:
+          emit changeFontSize(1);
+          break;
+
+        default:
+          special_function = false;
         }
-        else if( ke->state() == ControlButton && ke->key() == Key_V) {
-          pasteClipboard();
+        if (special_function) {
+          return true;
         }
+        //        else if( ke->state() == ControlButton && ke->key() == Key_V) {
+        //          pasteClipboard();
+        //        }
 //        else if( ke->state() == ControlButton && ke->key() == Key_C) {
@@ -1088,3 +1150,2 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
 //        }
-        else
             emit keyPressedSignal(ke); // expose
@@ -1118,3 +1179,2 @@ void TEWidget::frameChanged()
 }
-
 /* ------------------------------------------------------------------------- */
@@ -1169,3 +1229,3 @@ void TEWidget::calcGeometry()
     int dcolumns;
-    Config cfg("Konsole");
+    Config cfg("Qkonsole");
     cfg.setGroup("ScrollBar");