summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp24
-rw-r--r--noncore/apps/opie-console/function_keyboard.h6
2 files changed, 23 insertions, 7 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index a5b19c0..ac35d1c 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -1,27 +1,28 @@
#include "function_keyboard.h"
#include <qsizepolicy.h>
#include <qevent.h>
+#include <qwindowsystem_qws.h>
#include <qapplication.h>
FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
QFrame(parent), numRows(1), numCols(11),
pressedRow(0), pressedCol(0) {
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())
);
}
@@ -78,65 +79,74 @@ 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()
);
}
void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
pressedRow = e->y() / keyHeight;
pressedCol = (int) (e->x() / keyWidth);
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);
+ emit keyPressed(k.getU(), k.getQ(), 0, 1, 0);
+ /*
+ *
+ 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);
QKeyEvent ke(QEvent::KeyPress, k.getQ(), k.getU(), 0);
- QApplication::sendEvent(this, &ke);
+ QApplication::sendEvent((QObject *)parent, &ke);
+ */
}
void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
if (pressedRow != -1 && pressedRow != -1) {
int row = pressedRow; pressedRow = -1;
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);
+ emit keyPressed(k.getU(), k.getQ(), 0, 0, 0);
+
+ /*
+ QWSServer::sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0);
+ qwsServer->sendKeyEvent(k.getU(), k.getQ(), 0, 0, 0);
+
QKeyEvent ke(QEvent::KeyRelease, k.getQ(), k.getU(), 0);
- QApplication::sendEvent(this, &ke);
+ QApplication::sendEvent((QObject *)parent, &ke);
+ */
}
}
void FunctionKeyboard::resizeEvent(QResizeEvent*) {
/* set he default font height/width */
QFontMetrics fm=fontMetrics();
keyHeight = fm.lineSpacing() + 2;
keyWidth = (double)width()/numCols;
}
QSize FunctionKeyboard::sizeHint() const {
return QSize(width(), keyHeight * numRows + 1);
}
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index bc3e25c..b8420ae 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -20,39 +20,45 @@ public:
private:
QString label;
ushort qcode;
ushort unicode;
};
class FunctionKeyboard : public QFrame {
Q_OBJECT
public:
FunctionKeyboard(QWidget *parent = 0);
~FunctionKeyboard();
void paintEvent(QPaintEvent *);
void paintKey(int, int);
void mousePressEvent(QMouseEvent*);
void mouseReleaseEvent(QMouseEvent*);
void resizeEvent(QResizeEvent*);
QSize sizeHint() const;
+signals:
+
+ void keyPressed(ushort, ushort, bool, bool, bool);
+
private:
// thie key for the map is the row/col
QMap<QString, FKey> keys;
uint numRows;
uint numCols;
uint keyHeight;
double keyWidth; // decimal point matters!
int pressedRow, pressedCol;
+ QObject *parent;
+
};
#endif