summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp11
-rw-r--r--inputmethods/multikey/configdlg.h3
-rw-r--r--inputmethods/multikey/keyboard.cpp323
-rw-r--r--inputmethods/multikey/keyboard.h11
4 files changed, 299 insertions, 49 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
@@ -1,9 +1,10 @@
/*
* TODO
* make a font selection thing (size too)
- * make vertical keys possible
* make a keymap editor
+ * make keys translucent
+ * make vertical keys possible
*
*
*/
@@ -247,8 +248,14 @@ void ConfigDlg::repeatTog() {
emit repeatToggled(repeat_button->isChecked());
}
+void ConfigDlg::closeEvent(QCloseEvent *) {
+
+ // tell the parent it was closed, so delete me
+ emit configDlgClosed();
+}
+
// ConfigDlg::setMap {{{1
/*
* the index is kinda screwy, because in the config file, index 0 is just the
@@ -266,9 +273,9 @@ void ConfigDlg::setMap(int index) {
}
else if ((uint)index <= default_maps.count()) {
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 {
remove_button->setEnabled(true);
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
@@ -19,15 +19,18 @@ signals:
void repeatToggled(bool on_off);
void setMapToDefault();
void setMapToFile(QString map);
void reloadKeyboard();
+ void configDlgClosed();
private slots:
void pickTog();
void repeatTog();
void setMap(int index);
void addMap();
void removeMap();
+ virtual void closeEvent ( QCloseEvent * );
+
// all those required slots for the color push buttons
void keyColorClicked();
void keyColorPressedClicked();
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
@@ -39,10 +39,12 @@
/* 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)
{
@@ -94,9 +96,9 @@ Keyboard::~Keyboard() {
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?
if ( useLargeKeys ) {
nk = 15;
@@ -181,14 +183,34 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
ushort c = keys->uni(row, col);
p.setPen(textcolor);
if (!pix) {
- if (shift || lock)
- c = keys->shift(c);
- if (meta) {
+ 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)) {
+
+ // 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,
AlignCenter, (QChar)c);
}
@@ -207,9 +229,9 @@ 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;
int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0);
@@ -232,11 +254,29 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
p.setPen(textcolor);
if (!pix) {
if ((shift || lock) && keys->shift(c))
- c = 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,
keyWidthPix + 3, keyHeight,
AlignCenter, (QChar)c);
@@ -288,13 +328,31 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
// might need to repaint if two or more of the same keys.
// should be faster if just paint one key even though multiple keys exist.
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
if (qkeycode == Qt::Key_F1) { // toggle the pickboard
if ( configdlg ) {
+
delete (ConfigDlg *) configdlg;
configdlg = 0;
}
else {
@@ -308,8 +366,10 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
connect(configdlg, SIGNAL(repeatToggled(bool)),
this, SLOT(toggleRepeat(bool)));
connect(configdlg, SIGNAL(reloadKeyboard()),
this, SLOT(reloadKeyboard()));
+ connect(configdlg, SIGNAL(configDlgClosed()),
+ this, SLOT(cleanupConfigDlg()));
configdlg->showMaximized();
configdlg->show();
configdlg->raise();
}
@@ -358,13 +418,20 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
*lock = 0;
lock = 0;
}
}
- 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) {
need_repaint = TRUE;
@@ -373,19 +440,20 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
lock = 0;
}
else {
lock = keys->pressedPtr(row, col);;
- *lock = 1;
+ *lock = true;;
if (shift) {
*shift = 0;
shift = 0;
}
}
- 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) {
need_repaint = TRUE;
@@ -395,37 +463,123 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
} else {
meta = keys->pressedPtr(row, col);
- need_repaint = TRUE;
- *meta = !keys->pressed(row, col);
+ *meta = true;
}
- if (shift) {
+ // 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; }
- *shift = 0;
- shift = 0;
+ // dont need to emit this key... acts same as alt
+ qkeycode = 0;
+
+ // circumflex
+ } else if (qkeycode == 0x2000) {
+ need_repaint = TRUE;
+
+ if (circumflex) {
+
+ *circumflex = 0;
+ circumflex = 0;
+
+ } else {
+ circumflex = keys->pressedPtr(row, col);
+ *circumflex = true;
}
- if (lock) {
- *lock = 0;
- lock = 0;
+ /* no need to turn off shift or lock if circumflex
+ * keys are pressed
+
+ 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;
+ }
+
+ 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;
}
}
else { // normal char
if ((shift || lock) && keys->shift(unicode)) {
- unicode = 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);
+ }
}
// korean parsing
if (keys->lang == "ko") {
@@ -503,17 +657,24 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*)
*shift = 0; // unpress shift key
shift = 0; // reset the shift pointer
repaint(FALSE);
- } else if (meta && unicode != 0) {
+ }
+
+ /*
+ * do not make the meta key release after being pressed
+ *
+
+ else if (meta && unicode != 0) {
*meta = 0;
meta = 0;
repaint(FALSE);
}
- else
- clearHighlight();
+ */
+
+ else clearHighlight();
}
/* Keyboard::timerEvent {{{1 */
@@ -560,14 +721,20 @@ QSize Keyboard::sizeHint() const
{
QFontMetrics fm=fontMetrics();
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);
}
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();
}
@@ -603,8 +770,16 @@ void Keyboard::toggleRepeat(bool on) {
useRepeat = on;
//cout << "setting useRepeat to: " << useRepeat << "\n";
}
+void Keyboard::cleanupConfigDlg() {
+
+ if ( configdlg ) {
+ delete (ConfigDlg *) configdlg;
+ configdlg = 0;
+ }
+}
+
/* Keyboard::setMapTo ... {{{1 */
void Keyboard::setMapToDefault() {
@@ -613,22 +788,31 @@ void Keyboard::setMapToDefault() {
config->setGroup( "Language" );
QString l = config->readEntry( "Language" , "en" );
delete config;
- QString key_map = QPEApplication::qpeDir() + "/share/multikey/"
+ QString key_map = QPEApplication::qpeDir() + "share/multikey/"
+ l + ".keymap";
/* save change to multikey config file */
config = new Config("multikey");
config->setGroup ("keymaps");
config->writeEntry ("current", key_map); // default closed
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();
}
void Keyboard::setMapToFile(QString map) {
@@ -638,16 +822,24 @@ void Keyboard::setMapToFile(QString map) {
config->writeEntry ("current", map); // default closed
delete config;
+ int prevRows = keys->rows();
+
delete keys;
if (QFile(map).exists())
keys = new Keys(map);
else
keys = new Keys();
- repaint(FALSE);
+ if (keys->rows() != prevRows) {
+
+ QCopChannel::send ("QPE/TaskBar", "hideInputMethod()");
+ QCopChannel::send ("QPE/TaskBar", "showInputMethod()");
+ }
+ else repaint(FALSE);
+ resetState();
}
/* Keybaord::reloadKeyboard {{{1 */
void Keyboard::reloadKeyboard() {
@@ -1123,8 +1315,33 @@ void Keys::setKeysFromFile(const char * filename) {
buf = t.readLine();
}
+ // 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))) {
QTextStream tmp (buf, IO_ReadOnly);
@@ -1204,8 +1421,20 @@ int Keys::width(const int row, const int col) {
return keys[row].at(col)->width;
}
+
+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) {
return keys[row].at(col)->unicode;
@@ -1237,26 +1466,28 @@ void Keys::setPressed(const int row, const int col, const bool pressed) {
}
ushort Keys::shift(const ushort uni) {
- if (shiftMap[uni]) {
+ if (shiftMap[uni]) return shiftMap[uni];
+ else return 0;
+}
- return shiftMap[uni];
- }
- else
- return 0;
+ushort Keys::meta(const ushort uni) {
+ if (metaMap[uni]) return metaMap[uni];
+ else return 0;
}
-ushort Keys::meta(const ushort uni) {
+ushort Keys::circumflex(const ushort uni) {
- if (metaMap[uni]) {
+ if (circumflexMap[uni]) return circumflexMap[uni];
+ else return 0;
+}
- return metaMap[uni];
- }
- else
- return 0;
+ushort Keys::diaeresis(const ushort uni) {
+ if(diaeresisMap[uni]) return diaeresisMap[uni];
+ else return 0;
}
bool *Keys::pressedPtr(const int row, const int col) {
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
@@ -55,15 +55,18 @@ public:
Keys();
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);
void setKeysFromFile(const char *filename);
void setKey(const int row, const int qcode, const ushort unicode,
@@ -86,8 +89,10 @@ private:
QList<Key> keys[6];
QMap<ushort,ushort> shiftMap;
QMap<ushort,ushort> metaMap;
+ QMap<ushort,ushort> circumflexMap;
+ QMap<ushort,ushort> diaeresisMap;
};
class Keyboard : public QFrame
@@ -116,8 +121,9 @@ private slots:
void togglePickboard(bool on_off);
void toggleRepeat(bool on_off);
void setMapToDefault();
void setMapToFile(QString map);
+ void cleanupConfigDlg();
// used to redraw keyboard after edited colors
void reloadKeyboard();
@@ -129,8 +135,11 @@ private:
bool *lock;
bool *ctrl;
bool *alt;
bool *meta;
+ bool *circumflex;
+ bool *diaeresis;
+
uint useLargeKeys:1;
uint usePicks:1;
uint useRepeat:1;