| -rw-r--r-- | inputmethods/multikey/configdlg.cpp | 11 | ||||
| -rw-r--r-- | inputmethods/multikey/configdlg.h | 3 | ||||
| -rw-r--r-- | inputmethods/multikey/keyboard.cpp | 315 | ||||
| -rw-r--r-- | inputmethods/multikey/keyboard.h | 11 |
4 files changed, 295 insertions, 45 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index 26c9233..a8206b7 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp @@ -2,6 +2,7 @@ * TODO * make a font selection thing (size too) - * make vertical keys possible * make a keymap editor + * make keys translucent + * make vertical keys possible * * @@ -249,4 +250,10 @@ void ConfigDlg::repeatTog() { } +void ConfigDlg::closeEvent(QCloseEvent *) { + + // tell the parent it was closed, so delete me + emit configDlgClosed(); +} + // ConfigDlg::setMap {{{1 @@ -268,5 +275,5 @@ void ConfigDlg::setMap(int index) { remove_button->setDisabled(true); - emit setMapToFile(QPEApplication::qpeDir() + "/share/multikey/" + default_maps[index - 1]); + emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + default_maps[index - 1]); } else { diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h index 5d6403f..336932b 100644 --- a/inputmethods/multikey/configdlg.h +++ b/inputmethods/multikey/configdlg.h @@ -21,4 +21,5 @@ signals: void setMapToFile(QString map); void reloadKeyboard(); + void configDlgClosed(); private slots: @@ -28,4 +29,6 @@ private slots: void addMap(); void removeMap(); + virtual void closeEvent ( QCloseEvent * ); + // all those required slots for the color push buttons diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 4747f59..28d5cab 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp @@ -41,6 +41,8 @@ /* Keyboard::Keyboard {{{1 */ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : - QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), meta(0), - useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1), + QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), + meta(0), circumflex(0), diaeresis(0), + useLargeKeys(TRUE), usePicks(0), useRepeat(0), + pressedKeyRow(-1), pressedKeyCol(-1), unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0), configdlg(0) @@ -96,5 +98,5 @@ void Keyboard::resizeEvent(QResizeEvent*) int ph = picks->sizeHint().height(); picks->setGeometry( 0, 0, width(), ph ); - keyHeight = (height()-(usePicks ? ph : 0))/5; + keyHeight = (height()-(usePicks ? ph : 0))/keys->rows(); int nk; // number of keys? @@ -183,10 +185,30 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col) p.setPen(textcolor); if (!pix) { - if (shift || lock) + if ((shift || lock) && keys->shift(c)) + + if (circumflex && keys->circumflex(keys->shift(c))) + c = keys->circumflex(keys->shift(c)); + else if (diaeresis && keys->diaeresis(keys->shift(c))) + c = keys->diaeresis(keys->shift(c)); + else if (meta && keys->meta(keys->shift(c))) + c = keys->meta(keys->shift(c)); + else c = keys->shift(c); - if (meta) { + else if (meta && keys->meta(c)) c = keys->meta(c); + else if (circumflex && keys->circumflex(c)) + c = keys->circumflex(c); + else if (diaeresis && (keys->diaeresis(c) || c == 0x2c6)) { + + // the diaeresis key itself has to be in the diaeresisMap, + // or just do this to make it display the diaeresis char. + + if (c == 0x2c6) + c = 0xa8; + else + c = keys->diaeresis(c); } + p.drawText(x, y, defaultKeyWidth * keyWidth + 3, keyHeight, @@ -209,5 +231,5 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col) p.fillRect(0, 0, width(), height(), keycolor); - for (row = 1; row <= 5; row++) { + for (row = 1; row <= keys->rows(); row++) { int x = 0; @@ -234,7 +256,25 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col) if (!pix) { if ((shift || lock) && keys->shift(c)) + + if (circumflex && keys->circumflex(keys->shift(c))) + c = keys->circumflex(keys->shift(c)); + else if (diaeresis && keys->diaeresis(keys->shift(c))) + c = keys->diaeresis(keys->shift(c)); + else if (meta && keys->meta(keys->shift(c))) + c = keys->meta(keys->shift(c)); + else c = keys->shift(c); + else if (meta && keys->meta(c)) c = keys->meta(c); + else if (circumflex && keys->circumflex(c)) + c = keys->circumflex(c); + else if (diaeresis && (keys->diaeresis(c) || c == 0x2c6)) { + + if (c == 0x2c6) + c = 0xa8; + else + c = keys->diaeresis(c); + } p.drawText(x, y, @@ -290,4 +330,21 @@ void Keyboard::mousePressEvent(QMouseEvent *e) bool need_repaint = FALSE; + // circumflex and diaeresis support + // messy to have this here, but too hard to implement any other method + if (unicode == 0x2c6) { + + unicode = 0; + if (shift || lock) { + + // diaeresis + qkeycode = 0x2001; + } + else { + + // circumflex + qkeycode = 0x2000; + } + } + if (unicode == 0) { // either Qt char, or nothing @@ -295,4 +352,5 @@ void Keyboard::mousePressEvent(QMouseEvent *e) if ( configdlg ) { + delete (ConfigDlg *) configdlg; configdlg = 0; @@ -310,4 +368,6 @@ void Keyboard::mousePressEvent(QMouseEvent *e) connect(configdlg, SIGNAL(reloadKeyboard()), this, SLOT(reloadKeyboard())); + connect(configdlg, SIGNAL(configDlgClosed()), + this, SLOT(cleanupConfigDlg())); configdlg->showMaximized(); configdlg->show(); @@ -360,9 +420,16 @@ void Keyboard::mousePressEvent(QMouseEvent *e) } } - if (meta) { - *meta = 0; - meta = 0; - } + + /* + * want to be able to hit circumflex/diaeresis -> shift + * to type in shifted circumflex/diaeresis chars. + * same thing with meta + + if (meta) { *meta = 0; meta = 0; } + if (circumflex) { *circumflex = 0; circumflex = 0; } + if (diaeresis) { *diaeresis = 0; diaeresis = 0; } + + */ } else if (qkeycode == Qt::Key_CapsLock) { @@ -375,5 +442,5 @@ void Keyboard::mousePressEvent(QMouseEvent *e) else { lock = keys->pressedPtr(row, col);; - *lock = 1; + *lock = true;; if (shift) { *shift = 0; @@ -381,9 +448,10 @@ void Keyboard::mousePressEvent(QMouseEvent *e) } } - if (meta) { - *meta = 0; - meta = 0; - } + /* + if (meta) { *meta = 0; meta = 0; } + if (circumflex) { *circumflex = 0; circumflex = 0; } + if (diaeresis) { *diaeresis = 0; diaeresis = 0; } + */ } else if (qkeycode == Qt::Key_Meta) { @@ -397,22 +465,90 @@ void Keyboard::mousePressEvent(QMouseEvent *e) meta = keys->pressedPtr(row, col); + *meta = true; + } + + // reset all the other keys + if (shift) { *shift = 0; shift = 0; } + if (lock) { *lock = 0; lock = 0; } + if (circumflex) { *circumflex = 0; circumflex = 0; } + if (diaeresis) { *diaeresis = 0; diaeresis = 0; } + + // dont need to emit this key... acts same as alt + qkeycode = 0; + + // circumflex + } else if (qkeycode == 0x2000) { need_repaint = TRUE; - *meta = !keys->pressed(row, col); + + if (circumflex) { + + *circumflex = 0; + circumflex = 0; + + } else { + + circumflex = keys->pressedPtr(row, col); + *circumflex = true; } - if (shift) { + /* no need to turn off shift or lock if circumflex + * keys are pressed - *shift = 0; - shift = 0; + if (shift) { *shift = 0; shift = 0; } + if (lock) { *lock = 0; lock = 0; } + + */ + // have to reset all the other keys + if (meta) { *meta = 0; meta = 0; } + if (diaeresis) { + + // *diaeresis and *circumflex point to the same thing + // when diaeresis is enabled and you hit the circumflex + // since they are the same key, it should turn off the + // key + + *diaeresis = 0; + diaeresis = 0; + circumflex = 0; } - if (lock) { - *lock = 0; - lock = 0; + qkeycode = 0; + + // diaeresis + } else if (qkeycode == 0x2001) { + need_repaint = TRUE; + + if (diaeresis) { + *diaeresis = 0; + diaeresis = 0; + + } else { + + diaeresis = keys->pressedPtr(row, col); + *diaeresis = true; } - // dont need to emit this key... acts same as alt + + if (shift) { *shift = 0; shift = 0; } + + /* + * + if (lock) { *lock = 0; lock = 0; } + * + */ + + if (meta) { *meta = 0; meta = 0; } + if (circumflex) { + + // *circumflex = 0; + // + // same thing the diaeresis pointer points too + + circumflex = 0; + } + + qkeycode = 0; } @@ -421,9 +557,27 @@ void Keyboard::mousePressEvent(QMouseEvent *e) else { // normal char if ((shift || lock) && keys->shift(unicode)) { + + // make diaeresis/circumflex -> shift input shifted + // diaeresis/circumflex chars + + if (circumflex && keys->circumflex(keys->shift(unicode))) + unicode = keys->circumflex(keys->shift(unicode)); + else if (diaeresis && keys->diaeresis(keys->shift(unicode))) + unicode = keys->diaeresis(keys->shift(unicode)); + else if (meta && keys->meta(keys->shift(unicode))) + unicode = keys->meta(keys->shift(unicode)); + else unicode = keys->shift(unicode); } - if (meta && keys->meta(unicode)) { + else if (meta && keys->meta(unicode)) { unicode = keys->meta(unicode); } + else if (circumflex && keys->circumflex(unicode)) { + unicode = keys->circumflex(unicode); + } + else if (diaeresis && keys->diaeresis(unicode)) { + + unicode = keys->diaeresis(unicode); + } } @@ -505,5 +659,11 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*) repaint(FALSE); - } else if (meta && unicode != 0) { + } + + /* + * do not make the meta key release after being pressed + * + + else if (meta && unicode != 0) { *meta = 0; @@ -511,7 +671,8 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*) repaint(FALSE); } - else - clearHighlight(); + */ + + else clearHighlight(); } @@ -562,5 +723,5 @@ QSize Keyboard::sizeHint() const int keyHeight = fm.lineSpacing() + 2; - return QSize( 240, keyHeight * 5 + (usePicks ? picks->sizeHint().height() : 0) + 1); + return QSize( 240, keyHeight * keys->rows() + (usePicks ? picks->sizeHint().height() : 0) + 1); } @@ -568,4 +729,10 @@ QSize Keyboard::sizeHint() const void Keyboard::resetState() { + if (shift) { *shift = 0; shift = 0; } + if (lock) {*lock = 0; lock = 0; } + if (meta) { *meta = 0; meta = 0; } + if (circumflex) { *circumflex = 0; circumflex = 0; } + if (diaeresis) { *diaeresis = 0; diaeresis = 0; } + schar = mchar = echar = 0; picks->resetState(); @@ -605,4 +772,12 @@ void Keyboard::toggleRepeat(bool on) { } +void Keyboard::cleanupConfigDlg() { + + if ( configdlg ) { + delete (ConfigDlg *) configdlg; + configdlg = 0; + } +} + /* Keyboard::setMapTo ... {{{1 */ void Keyboard::setMapToDefault() { @@ -615,5 +790,5 @@ void Keyboard::setMapToDefault() { delete config; - QString key_map = QPEApplication::qpeDir() + "/share/multikey/" + QString key_map = QPEApplication::qpeDir() + "share/multikey/" + l + ".keymap"; @@ -624,9 +799,18 @@ void Keyboard::setMapToDefault() { delete config; + int prevRows = keys->rows(); + delete keys; keys = new Keys(key_map); // have to repaint the keyboard - repaint(FALSE); + if (prevRows != keys->rows()) { + + QCopChannel::send ("QPE/TaskBar", "hideInputMethod()"); + QCopChannel::send ("QPE/TaskBar", "showInputMethod()"); + + } else repaint(FALSE); + + resetState(); } @@ -640,4 +824,6 @@ void Keyboard::setMapToFile(QString map) { delete config; + int prevRows = keys->rows(); + delete keys; if (QFile(map).exists()) @@ -646,6 +832,12 @@ void Keyboard::setMapToFile(QString map) { keys = new Keys(); - repaint(FALSE); + if (keys->rows() != prevRows) { + + QCopChannel::send ("QPE/TaskBar", "hideInputMethod()"); + QCopChannel::send ("QPE/TaskBar", "showInputMethod()"); + } + else repaint(FALSE); + resetState(); } @@ -1125,4 +1317,29 @@ void Keys::setKeysFromFile(const char * filename) { } + // circumflex + else if (buf.contains(QRegExp("^\\s*c\\s+[0-9a-fx]+\\s+[0-9a-fx]+\\s*$", FALSE, FALSE))) { + + QTextStream tmp (buf, IO_ReadOnly); + ushort lower, shift; + QChar c; + tmp >> c >> lower >> shift; + + circumflexMap.insert(lower, shift); + + buf = t.readLine(); + } + // diaeresis + else if (buf.contains(QRegExp("^\\s*d\\s+[0-9a-fx]+\\s+[0-9a-fx]+\\s*$", FALSE, FALSE))) { + + QTextStream tmp (buf, IO_ReadOnly); + ushort lower, shift; + QChar d; + tmp >> d >> lower >> shift; + + diaeresisMap.insert(lower, shift); + + buf = t.readLine(); + } + // other variables like lang & title else if (buf.contains(QRegExp("^\\s*[a-zA-Z]+\\s*=\\s*[a-zA-Z0-9/]+\\s*$", FALSE, FALSE))) { @@ -1206,4 +1423,16 @@ int Keys::width(const int row, const int col) { } + +int Keys::rows() { + + for (int i = 1; i <= 5; i++) { + + if (keys[i].count() == 0) + return i - 1; + + } + return 5; +} + ushort Keys::uni(const int row, const int col) { @@ -1239,22 +1468,24 @@ void Keys::setPressed(const int row, const int col, const bool pressed) { ushort Keys::shift(const ushort uni) { - if (shiftMap[uni]) { - - return shiftMap[uni]; - } - else - return 0; - + if (shiftMap[uni]) return shiftMap[uni]; + else return 0; } ushort Keys::meta(const ushort uni) { - if (metaMap[uni]) { + if (metaMap[uni]) return metaMap[uni]; + else return 0; +} + +ushort Keys::circumflex(const ushort uni) { - return metaMap[uni]; + if (circumflexMap[uni]) return circumflexMap[uni]; + else return 0; } - else - return 0; +ushort Keys::diaeresis(const ushort uni) { + + if(diaeresisMap[uni]) return diaeresisMap[uni]; + else return 0; } diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index 1aa7a35..8af80d0 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h @@ -57,11 +57,14 @@ public: Keys(const char * filename); ~Keys(); + int width(const int row, const int col); + int rows(); ushort uni(const int row, const int col); int qcode(const int row, const int col); - int width(const int row, const int col); bool pressed(const int row, const int col); bool *pressedPtr(const int row, const int col); ushort shift(const ushort); ushort meta(const ushort); + ushort circumflex(const ushort); + ushort diaeresis(const ushort); QImage *pix(const int row, const int col); int numKeys(const int row); @@ -88,4 +91,6 @@ private: QMap<ushort,ushort> shiftMap; QMap<ushort,ushort> metaMap; + QMap<ushort,ushort> circumflexMap; + QMap<ushort,ushort> diaeresisMap; }; @@ -118,4 +123,5 @@ private slots: void setMapToDefault(); void setMapToFile(QString map); + void cleanupConfigDlg(); // used to redraw keyboard after edited colors @@ -131,4 +137,7 @@ private: bool *alt; bool *meta; + bool *circumflex; + bool *diaeresis; + uint useLargeKeys:1; uint usePicks:1; |