2 files changed, 88 insertions, 5 deletions

diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index a3da5b2..9b036f3 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -1,10 +1,31 @@
 #include "function_keyboard.h"
 #include <qsizepolicy.h> 
+#include <qwindowsystem_qws.h>
 
 FunctionKeyboard::FunctionKeyboard(QWidget *parent) : 
-    QFrame(parent), numRows(2), numCols(15), 
+    QFrame(parent), numRows(1), numCols(11), 
     pressedRow(0), pressedCol(0) {
 
-    setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+    setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
+
+    Config conf("opie-console-keys");
+    conf.setGroup("keys");
+    for (int r = 0; r < numRows; r++)
+        for (int c = 0; c < numCols; c++) {
+
+            QString handle = "r" + QString::number(r) + "c" + QString::number(c);
+            QStringList value_list = conf.readListEntry( handle, '|');
+
+            if (value_list.isEmpty()) continue;
+
+            keys.insert(
+
+                 handle, 
+                 FKey (value_list[0], value_list[1].toUShort(), value_list[2].toUShort())
+            );
+        }
+    qWarning("loaded %d keys", keys.count());
+
+
 
 }
@@ -20,17 +41,35 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
     p.fillRect(0, 0, width(), height(), QColor(255,255,255));
 
+    p.setPen(QColor(0,0,0));
+
     /* those decimals do count! becomes short if use plain int */
     for (double i = 0; i <= width(); i += keyWidth) {
 
-        p.setPen(QColor(0,0,0));
         p.drawLine((int)i, 0, (int)i, height());
     }
 
-    for (int i = 0; i <= height(); i += height()/numRows) {
+    // sometimes the last line doesnt get drawn
+    p.drawLine(width() -1, 0, width() -1, height());
+
+    for (int i = 0; i <= height(); i += keyHeight) {
 
-        p.setPen(QColor(0,0,0));
         p.drawLine(0, i, width(), i);
     }
 
+    for (int r = 0; r < numRows; r++) {
+        for (int c = 0; c < numCols; c++) {
+
+            QString handle = "r" + QString::number(r) + "c" + QString::number(c);
+            if (keys.contains(handle)) {
+
+                p.drawText(
+                                c * keyWidth + 1, r * keyHeight + 1, 
+                                keyWidth, keyHeight, 
+                                Qt::AlignHCenter | Qt::AlignVCenter, 
+                                keys[handle].getL()
+                );
+            }
+        }
+    }
 }
 
@@ -38,7 +77,15 @@ void FunctionKeyboard::paintKey(int row, int col) {
 
     QPainter p(this);
+    
     p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1), 
                      QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)), 
                (pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255));
+    p.drawText(
+                    col * keyWidth + 1, row * keyHeight + 1, 
+                    keyWidth, keyHeight, 
+                    Qt::AlignHCenter | Qt::AlignVCenter, 
+                    keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
+    );
+
 }
 
@@ -49,4 +96,10 @@ void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
 
     paintKey(pressedRow, pressedCol);
+
+    // emit that sucker!
+    FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)];
+    //QWSServer::sendKeyEvent(k.getU(), k.getQ(), 0, 1, 0);
+    //qwsServer->sendKeyEvent(k.getU(), k.getQ(), 0, 1, 0);
+    qwsServer->sendKeyEvent(0x41, 0, 0, 1, 0);
 }
 
@@ -58,5 +111,10 @@ void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
         int col = pressedCol; pressedCol = -1;
         paintKey(row, col);
+
+        FKey k = keys["r" + QString::number(row) + "c" + QString::number(col)];
+        //QWSServer::sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0);
+        //qwsServer->sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0);
     }
+
 }
 
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index f1ca037..bc3e25c 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -2,6 +2,26 @@
 #define OPIE_FUNCTION_KEYBOARD_H
 
+#include <qpe/config.h>
 #include <qframe.h>
 #include <qpainter.h>
+#include <qmap.h>
+
+class FKey {
+
+public:
+
+    FKey(): qcode(0), unicode(0) {};
+    FKey(const QString &l, ushort q, ushort u): label(l), qcode(q), unicode(u) {};
+
+    QString getL() { return label; }
+    ushort getQ() { return qcode; }
+    ushort getU() { return unicode; }
+
+private:
+
+    QString label;
+    ushort qcode;
+    ushort unicode;
+};
 
 class FunctionKeyboard : public QFrame {
@@ -18,8 +38,13 @@ public:
     void resizeEvent(QResizeEvent*);
 
+    
 
     QSize sizeHint() const;
 
 private:
+
+    // thie key for the map is the row/col
+    QMap<QString, FKey> keys;
+
     uint numRows;
     uint numCols;