author | hash <hash> | 2002-09-06 21:23:05 (UTC) |
---|---|---|
committer | hash <hash> | 2002-09-06 21:23:05 (UTC) |
commit | fc4808bea669f75af0c28ba65cf2c638c97e99ba (patch) (side-by-side diff) | |
tree | 2ced268c3d31f9dded6d8332698ee8e476a081c0 | |
parent | 15992c5f9b24eaf8df6f90d1993c85d73827b98f (diff) | |
download | opie-fc4808bea669f75af0c28ba65cf2c638c97e99ba.zip opie-fc4808bea669f75af0c28ba65cf2c638c97e99ba.tar.gz opie-fc4808bea669f75af0c28ba65cf2c638c97e99ba.tar.bz2 |
french and other stuff fixed
-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 @@ -1,398 +1,405 @@ /* * TODO * make a font selection thing (size too) - * make vertical keys possible * make a keymap editor + * make keys translucent + * make vertical keys possible * * */ #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qwidget.h> #include <qdialog.h> #include <qtabwidget.h> #include <qvbox.h> #include <qgrid.h> #include <qgroupbox.h> #include <qlabel.h> #include <qcheckbox.h> #include <qsizepolicy.h> #include <qpushbutton.h> #include <qlistbox.h> #include <qstringlist.h> #include <opie/ofiledialog.h> #include <opie/colordialog.h> #include <qdir.h> #include <qfileinfo.h> #include "configdlg.h" #include "keyboard.h" // ConfigDlg::ConfigDlg() {{{1 ConfigDlg::ConfigDlg () : QTabWidget () { setCaption( tr("Multikey Configuration") ); Config config ("multikey"); config.setGroup("keymaps"); QString current_map = config.readEntry("current", 0); /* * 'general config' tab */ QVBox *gen_box = new QVBox (this); gen_box->setMargin(3); addTab(gen_box, tr("General Settings")); QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box); keymaps = new QListBox (map_group); keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); QString cur(tr("Current Language")); keymaps->insertItem(cur); keymaps->setSelected(0, true); QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); default_maps = map_dir.entryList(); // so i can access it in other places for (uint i = 0; i < map_dir.count(); i++) { QFile map (map_dir.absPath() + "/" + map_dir[i]); if (map.open(IO_ReadOnly)) { QString line; bool found = 0; map.readLine(line, 1024); while (!map.atEnd()) { if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); found = 1; break; } map.readLine(line, 1024); } if (!found) keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]); map.close(); } if (map_dir.absPath() + "/" + map_dir[i] == current_map) { keymaps->setSelected(i + 1, true); } } custom_maps = config.readListEntry("maps", QChar('|')); for (uint i = 0; i < custom_maps.count(); i++) { if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false) || !QFile::exists(custom_maps[i])) { custom_maps.remove(custom_maps.at(i)); // remove it from the list too config.writeEntry("maps", custom_maps.join("|")); } else { QFile map (custom_maps[i]); if (map.open(IO_ReadOnly)) { QString line; bool found = 0; map.readLine(line, 1024); while (!map.atEnd()) { if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); found = 1; break; } map.readLine(line, 1024); } if (!found) keymaps->insertItem(custom_maps[i]); map.close(); } if (custom_maps[i] == current_map) { keymaps->setSelected(map_dir.count() + i + 1, true); } } } // have to "+1" because the "current language" listItem... remember? connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); QGrid *add_remove_grid = new QGrid(2, map_group); add_remove_grid->setMargin(3); add_remove_grid->setSpacing(3); add_button = new QPushButton(tr("Add"), add_remove_grid); add_button->setFlat((bool)1); connect(add_button, SIGNAL(clicked()), SLOT(addMap())); remove_button = new QPushButton(tr("Remove"), add_remove_grid); remove_button->setFlat((bool)1); if ((int)map_dir.count() >= keymaps->currentItem()) remove_button->setDisabled(true); connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); // make a box that will contain the buttons on the bottom QGrid *other_grid = new QGrid(2, gen_box); pick_button = new QCheckBox(tr("Pickboard"), other_grid); config.setGroup ("general"); bool pick_open = config.readBoolEntry ("usePickboard", (bool)0); // default closed if (pick_open) { pick_button->setChecked(true); } // by connecting it after checking it, the signal isn't emmited connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog())); repeat_button = new QCheckBox(tr("Key Repeat"), other_grid); bool repeat_on = config.readBoolEntry ("useRepeat", (bool)1); if (repeat_on) { repeat_button->setChecked(true); } connect (repeat_button, SIGNAL(clicked()), this, SLOT(repeatTog())); /* * 'color' tab */ QGrid *color_box = new QGrid(2, this); color_box->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); color_box->setMargin(3); color_box->setSpacing(3); addTab(color_box, tr("Colors")); QLabel *label; QStringList color; config.setGroup("colors"); label = new QLabel(tr("Key Color"), color_box); keycolor_button = new QPushButton(color_box); connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked())); keycolor_button->setFlat((bool)1); color = config.readListEntry("keycolor", QChar(',')); /* * hopefully not required if (color.isEmpty()) { color = QStringList::split(",", "240,240,240"); config.writeEntry("keycolor", color.join(",")); } */ keycolor_button->setPalette(QPalette(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))); label = new QLabel(tr("Key Pressed Color"), color_box); keycolor_pressed_button = new QPushButton(color_box); connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked())); keycolor_pressed_button->setFlat((bool)1); color = config.readListEntry("keycolor_pressed", QChar(',')); keycolor_pressed_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); label = new QLabel(tr("Line Color"), color_box); keycolor_lines_button = new QPushButton(color_box); connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked())); keycolor_lines_button->setFlat((bool)1); color = config.readListEntry("keycolor_lines", QChar(',')); keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); label = new QLabel(tr("Text Color"), color_box); textcolor_button = new QPushButton(color_box); connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked())); textcolor_button->setFlat((bool)1); color = config.readListEntry("textcolor", QChar(',')); textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); label = new QLabel("", color_box); // a spacer so the above buttons dont expand label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); } void ConfigDlg::pickTog() { Config config ("multikey"); config.setGroup ("general"); config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed emit pickboardToggled(pick_button->isChecked()); } void ConfigDlg::repeatTog() { Config config ("multikey"); config.setGroup ("general"); config.writeEntry ("useRepeat", repeat_button->isChecked()); // default closed 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 * first element in the QStringList, but here it's the "Current Language" * listItem. therefor you have to minus one to the index before you access it. * */ void ConfigDlg::setMap(int index) { if (index == 0) { remove_button->setDisabled(true); emit setMapToDefault(); } 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); emit setMapToFile(custom_maps[index - default_maps.count() - 1]); } } // ConfigDlg::addMap() {{{1 void ConfigDlg::addMap() { QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); if (map.isNull()) return; Config config ("multikey"); config.setGroup("keymaps"); QStringList maps = config.readListEntry("maps", QChar('|')); maps.append(map); custom_maps.append(map); QFile map_file (map); if (map_file.open(IO_ReadOnly)) { QString line; bool found = 0; map_file.readLine(line, 1024); while (!map_file.atEnd()) { if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); found = 1; break; } map_file.readLine(line, 1024); } if (!found) keymaps->insertItem(map); map_file.close(); } keymaps->setSelected(keymaps->count() - 1, true); config.writeEntry("maps", maps, QChar('|')); config.writeEntry("current", map); } // ConfigDlg::removeMap() {{{1 void ConfigDlg::removeMap() { // move selection up one keymaps->setSelected(keymaps->currentItem() - 1, true); // delete the next selected item cus you just moved it up keymaps->removeItem(keymaps->currentItem() + 1); custom_maps.remove(custom_maps.at(keymaps->currentItem() - default_maps.count())); // write the changes Config config ("multikey"); config.setGroup("keymaps"); config.writeEntry("maps", custom_maps, QChar('|')); } /* ConfigDlg::slots for the color buttons {{{1 * * these four slots are almost the same, except for the names. i was thinking * of making a map with pointers to the buttons and names of the configEntry * so it could be one slot, but then there would be no way of telling which * of the buttons was clicked if they all connect to the same slot. * */ void ConfigDlg::keyColorClicked() { Config config ("multikey"); config.setGroup ("colors"); QStringList color = config.readListEntry("keycolor", QChar(',')); QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); color[0].setNum(newcolor.red()); color[1].setNum(newcolor.green()); color[2].setNum(newcolor.blue()); config.writeEntry("keycolor", color, QChar(',')); config.write(); keycolor_button->setPalette(QPalette(newcolor)); emit reloadKeyboard(); } void ConfigDlg::keyColorPressedClicked() { Config config ("multikey"); config.setGroup ("colors"); QStringList color = config.readListEntry("keycolor_pressed", QChar(',')); QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); color[0].setNum(newcolor.red()); color[1].setNum(newcolor.green()); color[2].setNum(newcolor.blue()); config.writeEntry("keycolor_pressed", color, QChar(',')); config.write(); keycolor_pressed_button->setPalette(QPalette(newcolor)); emit reloadKeyboard(); } void ConfigDlg::keyColorLinesClicked() { Config config ("multikey"); config.setGroup ("colors"); QStringList color = config.readListEntry("keycolor_lines", QChar(',')); QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); color[0].setNum(newcolor.red()); color[1].setNum(newcolor.green()); color[2].setNum(newcolor.blue()); config.writeEntry("keycolor_lines", color, QChar(',')); config.write(); 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 @@ -1,56 +1,59 @@ #include <qpe/qpeapplication.h> #include <qtabwidget.h> #include <qcheckbox.h> #include <qlistbox.h> #include <qpushbutton.h> #ifndef CONFIGDLG_H #define CONFIGDLG_H class ConfigDlg : public QTabWidget { Q_OBJECT public: ConfigDlg (); signals: void pickboardToggled(bool on_off); 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(); void keyColorLinesClicked(); void textColorClicked(); private: QCheckBox *pick_button; QCheckBox *repeat_button; QListBox *keymaps; QPushButton *add_button; QPushButton *remove_button; QStringList default_maps; // the maps in your share/multikey/ dir QStringList custom_maps; // maps you added with the 'add' button /* color buttons */ QPushButton *keycolor_button; QPushButton *keycolor_pressed_button; QPushButton *keycolor_lines_button; QPushButton *textcolor_button; }; #endif 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 @@ -1,777 +1,969 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "keyboard.h" #include "configdlg.h" #include <qpe/global.h> #include <qpe/qcopenvelope_qws.h> #include <qwindowsystem_qws.h> #include <qpainter.h> #include <qfontmetrics.h> #include <qtimer.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <ctype.h> #include <qfile.h> #include <qtextstream.h> #include <qstringlist.h> #include <sys/utsname.h> /* 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) { // get the default font Config *config = new Config( "qpe" ); config->setGroup( "Appearance" ); QString familyStr = config->readEntry( "FontFamily", "fixed" ); delete config; config = new Config("multikey"); config->setGroup ("general"); usePicks = config->readBoolEntry ("usePickboard", 0); // default closed useRepeat = config->readBoolEntry ("useRepeat", 1); delete config; setFont( QFont( familyStr, 10 ) ); picks = new KeyboardPicks( this ); picks->setFont( QFont( familyStr, 10 ) ); picks->initialise(); if (usePicks) { QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); } else picks->hide(); loadKeyboardColors(); keys = new Keys(); repeatTimer = new QTimer( this ); connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); } Keyboard::~Keyboard() { if ( configdlg ) { delete (ConfigDlg *) configdlg; configdlg = 0; } } /* Keyboard::resizeEvent {{{1 */ 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; } else { nk = 19; } defaultKeyWidth = (width()/nk)/2; xoffs = (width()-defaultKeyWidth*nk)/2; // empty key spaces? } /* KeyboardPicks::initialize {{{1 */ void KeyboardPicks::initialise() { setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); mode = 0; dc = new KeyboardConfig(this); configs.append(dc); } /* KeyboardPicks::sizeHint {{{1 */ QSize KeyboardPicks::sizeHint() const { return QSize(240,fontMetrics().lineSpacing()); } /* KeyboardConfig::generateText {{{1 */ void KeyboardConfig::generateText(const QString &s) { #if defined(Q_WS_QWS) || defined(_WS_QWS_) for (int i=0; i<(int)backspaces; i++) { parent->emitKey( 0, Qt::Key_Backspace, 0, true, false ); parent->emitKey( 0, Qt::Key_Backspace, 0, false, false ); } for (int i=0; i<(int)s.length(); i++) { parent->emitKey( s[i].unicode(), 0, 0, true, false ); parent->emitKey( s[i].unicode(), 0, 0, false, false ); } parent->emitKey( 0, Qt::Key_Space, 0, true, false ); parent->emitKey( 0, Qt::Key_Space, 0, false, false ); backspaces = 0; #endif } /* Keyboard::paintEvent {{{1 */ void Keyboard::paintEvent(QPaintEvent* e) { QPainter painter(this); painter.setClipRect(e->rect()); drawKeyboard( painter ); picks->dc->draw( &painter ); } /* Keyboard::drawKeyboard {{{1 */ void Keyboard::drawKeyboard(QPainter &p, int row, int col) { if (row != -1 && col != -1) { //just redraw one key int x = 0; for (int i = 0; i < col; i++) { x += keys->width(row, i) * defaultKeyWidth; } int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0); int keyWidth = keys->width(row, col); p.fillRect(x + 1, y + 1, keyWidth * defaultKeyWidth - 1, keyHeight - 1, pressed || keys->pressed(row, col) ? keycolor_pressed : keycolor); QImage *pix = keys->pix(row,col); ushort c = keys->uni(row, 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, AlignCenter, (QChar)c); } else // center the image in the middle of the key p.drawImage( x + (defaultKeyWidth * keyWidth - pix->width())/2 + 1, y + (keyHeight - pix->height())/2 + 1, *pix ); // this fixes the problem that the very right end of the board's vertical line // gets painted over, because it's one pixel shorter than all other keys p.setPen(keycolor_lines); p.drawLine(width() - 1, 0, width() - 1, height()); } else { 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); p.setPen(keycolor_lines); p.drawLine(x, y, x + width(), y); for (int col = 0; col < keys->numKeys(row); col++) { QImage *pix = keys->pix(row, col); int keyWidth = keys->width(row, col); int keyWidthPix = defaultKeyWidth * keyWidth; if (keys->pressed(row, col)) p.fillRect(x+1, y+1, keyWidthPix - 1, keyHeight - 1, keycolor_pressed); ushort c = keys->uni(row, col); p.setPen(textcolor); 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, keyWidthPix + 3, keyHeight, AlignCenter, (QChar)c); } else { // center the image in the middle of the key pix->setColor(1, textcolor.rgb()); p.drawImage( x + (keyWidthPix - pix->width())/2 + 1, y + (keyHeight - pix->height())/2 + 1, QImage(*pix) ); } p.setPen(keycolor_lines); p.drawLine(x, y, x, y + keyHeight); x += keyWidthPix; } } p.setPen(keycolor_lines); p.drawLine(0, height() - 1, width(), height() - 1); p.drawLine(width() - 1, 0, width() - 1, height()); } } /* Keyboard::mousePressEvent {{{1 */ void Keyboard::mousePressEvent(QMouseEvent *e) { int row = (e->y() - (usePicks ? picks->height() : 0)) / keyHeight + 1; if (row > 5) row = 5; // figure out the column int col = 0; for (int w = 0; e->x() >= w; col++) if (col < keys->numKeys(row)) // it segfaults if it trys to read past numKeys w += keys->width(row,col) * defaultKeyWidth; else break; if (col <= 0) return; col --; // rewind one... qkeycode = keys->qcode(row, col); unicode = keys->uni(row, col); // 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 { configdlg = new ConfigDlg (); connect(configdlg, SIGNAL(setMapToDefault()), this, SLOT(setMapToDefault())); connect(configdlg, SIGNAL(setMapToFile(QString)), this, SLOT(setMapToFile(QString))); connect(configdlg, SIGNAL(pickboardToggled(bool)), this, SLOT(togglePickboard(bool))); 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(); } } else if (qkeycode == Qt::Key_Control) { need_repaint = TRUE; if (ctrl) { *ctrl = 0; ctrl = 0; } else { ctrl = keys->pressedPtr(row, col); need_repaint = TRUE; *ctrl = !keys->pressed(row, col); } } else if (qkeycode == Qt::Key_Alt) { need_repaint = TRUE; if (alt) { *alt = 0; alt = 0; } else { alt = keys->pressedPtr(row, col); need_repaint = TRUE; *alt = !keys->pressed(row, col); } } else if (qkeycode == Qt::Key_Shift) { need_repaint = TRUE; if (shift) { *shift = 0; shift = 0; } else { shift = keys->pressedPtr(row, col); *shift = 1; if (lock) { *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; if (lock) { *lock = 0; 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; if (meta) { *meta = 0; meta = 0; } else { 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; } } 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); + } } // korean parsing if (keys->lang == "ko") { unicode = parseKoreanInput(unicode); } modifiers = (ctrl ? Qt::ControlButton : 0) | (alt ? Qt::AltButton : 0); if ('A' <= unicode && unicode <= 'z' && modifiers) { qkeycode = QChar(unicode).upper(); unicode = qkeycode - '@'; } QWSServer::sendKeyEvent(unicode, qkeycode, modifiers, true, false); // pickboard stuff if (usePicks) { KeyboardConfig *dc = picks->dc; if (dc) { if (qkeycode == Qt::Key_Backspace) { dc->input.remove(dc->input.last()); // remove last input dc->decBackspaces(); } else if ( qkeycode == Qt::Key_Return || QChar(unicode).isPunct() || QChar(unicode).isSpace() || unicode == 0) { dc->input.clear(); dc->resetBackspaces(); } else { dc->add(QString(QChar(unicode))); dc->incBackspaces(); } } picks->repaint(); } // painting pressed = TRUE; pressedKeyRow = row; pressedKeyCol = col; if (need_repaint) repaint(FALSE); else { // just paint the one key pressed QPainter p(this); drawKeyboard(p, row, col); } if (useRepeat) repeatTimer->start( 800 ); //pressTid = startTimer(80); } /* Keyboard::mouseReleaseEvent {{{1 */ void Keyboard::mouseReleaseEvent(QMouseEvent*) { pressed = FALSE; //if ( pressTid == 0 ) #if defined(Q_WS_QWS) || defined(_WS_QWS_) if ( unicode != -1 ) { emit key( unicode, qkeycode, modifiers, false, false ); repeatTimer->stop(); } #endif if (shift && unicode != 0) { *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 */ /* dont know what this does, but i think it is here so that if your screen * sticks (like on an ipaq) then it will stop repeating if you click another * key... but who knows what anything does in this thing anyway? void Keyboard::timerEvent(QTimerEvent* e) { if ( e->timerId() == pressTid ) { killTimer(pressTid); pressTid = 0; if ( !pressed ) cout << "calling clearHighlight from timerEvent\n"; //clearHighlight(); } } */ void Keyboard::repeat() { repeatTimer->start( 200 ); emit key( unicode, qkeycode, modifiers, true, true ); } void Keyboard::clearHighlight() { if ( pressedKeyRow >= 0 && pressedKeyCol >= 0) { int tmpRow = pressedKeyRow; int tmpCol = pressedKeyCol; pressedKeyRow = -1; pressedKeyCol = -1; QPainter p(this); drawKeyboard(p, tmpRow, tmpCol); } } /* Keyboard::sizeHint {{{1 */ 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(); } /* Keyboard::togglePickboard {{{1 */ void Keyboard::togglePickboard(bool on_off) { usePicks = on_off; if (usePicks) { picks->show(); //move(x(), y() - picks->height()); // not required anymore because QCopChannel::send //adjustSize(); QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); } else { picks->hide(); picks->resetState(); //move(x(), y() + picks->height()); //adjustSize(); QObject::disconnect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); } /* * this closes && opens the input method */ QCopChannel::send ("QPE/TaskBar", "hideInputMethod()"); QCopChannel::send ("QPE/TaskBar", "showInputMethod()"); } 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() { /* load current locale language map */ Config *config = new Config("locale"); 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) { /* save change to multikey config file */ Config *config = new Config("multikey"); config->setGroup ("keymaps"); 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() { // reload colors and redraw loadKeyboardColors(); repaint(); } void Keyboard::loadKeyboardColors() { Config config ("multikey"); config.setGroup("colors"); QStringList color; color = config.readListEntry("keycolor", QChar(',')); if (color.isEmpty()) { color = QStringList::split(",", "240,240,240"); config.writeEntry("keycolor", color.join(",")); } keycolor = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()); color = config.readListEntry("keycolor_pressed", QChar(',')); if (color.isEmpty()) { color = QStringList::split(",", "171,183,198"); config.writeEntry("keycolor_pressed", color.join(",")); } keycolor_pressed = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()); color = config.readListEntry("keycolor_lines", QChar(',')); if (color.isEmpty()) { color = QStringList::split(",", "138,148,160"); config.writeEntry("keycolor_lines", color.join(",")); } keycolor_lines = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()); color = config.readListEntry("textcolor", QChar(',')); if (color.isEmpty()) { color = QStringList::split(",", "43,54,68"); config.writeEntry("textcolor", color.join(",")); } textcolor = QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()); } /* korean input functions {{{1 * * TODO * one major problem with this implementation is that you can't move the * cursor after inputing korean chars, otherwise it will eat up and replace * the char before the cursor you move to. fix that * * make backspace delete one single char, not the whole thing if still * editing. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * how korean input works * * all following chars means unicode char value and are in hex * * ÃÊÀ½ = schar (start char) * ÁßÀ½ = mchar (middle char) * ³¡À½ = echar (end char) * * there are 19 schars. unicode position is at 1100 - 1112 * there are 21 mchars. unicode position is at 1161 - 1175 * there are 27 echars. unicode position is at 11a8 - 11c2 * * the map with everything combined is at ac00 - d7a3 * */ ushort Keyboard::parseKoreanInput (ushort c) { if ((c != 0 && (c < 0x1100 || 0x11c2 < c) && (c < 0xac00 || 0xd7a3 < c)) || (c == 0 && qkeycode != Qt::Key_Shift && Qt::Key_CapsLock != qkeycode && qkeycode != Qt::Key_Control && qkeycode != Qt::Key_Alt)) { schar = 0, mchar = 0, echar = 0; return c; } if ( 0x1100 <= c && c <= 0x1112 ) { // schar or echar was input if (schar == 0 || (schar != 0 && mchar == 0)) { schar = c; mchar = 0; echar = 0; return c; } else if (mchar != 0) { if (echar == 0) { if (!(echar = constoe(c))) { schar = c; mchar = 0; echar = 0; return c; } } else { // must figure out what the echar is if (echar == 0x11a8) { // ¤¡ if (c == 0x1100) echar = 0x11a9; // ¤¡ + ¤¡ else if (c == 0x1109) echar = 0x11aa; // ¤¡ + ¤µ else { schar = c; mchar = 0; echar = 0; return c; } } else if (echar == 0x11ab) { // ¤¤ if (c == 0x110c) echar = 0x11ac; // ¤¤ + ¤¸ else if (c == 0x1112) echar = 0x11ad; // ¤¤ + ¤¾ else { schar = c; mchar = 0; echar = 0; return c; } } else if (echar == 0x11af) { // ¤© @@ -999,266 +1191,305 @@ ushort Keyboard::constoe(const ushort c) { } } // Keys::Keys {{{1 Keys::Keys() { Config *config = new Config ("multikey"); config->setGroup( "keymaps" ); QString map = config->readEntry( "current" ); delete config; if (map.isNull() || !(QFile(map).exists())) { Config *config = new Config("locale"); config->setGroup( "Language" ); QString l = config->readEntry( "Language" , "en" ); delete config; map = QPEApplication::qpeDir() + "/share/multikey/" + l + ".keymap"; } setKeysFromFile(map); } Keys::Keys(const char * filename) { setKeysFromFile(filename); } // Keys::setKeysFromFile {{{2 void Keys::setKeysFromFile(const char * filename) { QFile f(filename); if (f.open(IO_ReadOnly)) { QTextStream t(&f); int row; int qcode; ushort unicode; int width; QString buf; QString comment; char * xpm[256]; //couldnt be larger than that... could it? QImage *xpm2pix = 0; buf = t.readLine(); while (buf) { // get rid of comments buf.replace(QRegExp("#.*$", FALSE, FALSE), ""); // key definition if (buf.contains(QRegExp("^\\d+\\s+[0-1a-fx]+", FALSE, FALSE))) { // no $1 type referencing!!! this implementation of regexp sucks // dont know of any sscanf() type funcs in Qt lib QTextStream tmp (buf, IO_ReadOnly); tmp >> row >> qcode >> unicode >> width >> comment; buf = t.readLine(); int xpmLineCount = 0; xpm2pix = 0; // erase blank space while (buf.contains(QRegExp("^\\s*$")) && buf) buf = t.readLine(); while (buf.contains(QRegExp("^\\s*\".*\""))) { QString xpmBuf = buf.stripWhiteSpace(); xpm[xpmLineCount] = new char [xpmBuf.length()]; int j = 0; for (ushort i = 0; i < xpmBuf.length(); i++) { if (xpmBuf[i].latin1() != '"') { ((char *)xpm[xpmLineCount])[j] = xpmBuf.at(i).latin1(); j++; } } // have to close that facker up ((char *)xpm[xpmLineCount])[j] = '\0'; xpmLineCount++; buf = t.readLine(); } if (xpmLineCount) { xpm2pix = new QImage((const char **)xpm); for (int i = 0; i < xpmLineCount; i++) delete [] (xpm[i]); } setKey(row, qcode, unicode, width, xpm2pix); } // shift map else if (buf.contains(QRegExp("^[0-9a-fx]+\\s+[0-9a-fx]+\\s*$", FALSE, FALSE))) { QTextStream tmp (buf, IO_ReadOnly); ushort lower, shift; tmp >> lower >> shift; shiftMap.insert(lower, shift); buf = t.readLine(); } // meta key map else if (buf.contains(QRegExp("^\\s*m\\s+[0-9a-fx]+\\s+[0-9a-fx]+\\s*$", FALSE, FALSE))) { QTextStream tmp (buf, IO_ReadOnly); ushort lower, shift; QChar m; tmp >> m >> lower >> shift; metaMap.insert(lower, shift); 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); QString name, equals, value; tmp >> name >> equals >> value; if (name == "lang") { lang = value; } buf = t.readLine(); } // comments else if (buf.contains(QRegExp("^\\s*#"))) { buf = t.readLine(); } else { // blank line, or garbage buf = t.readLine(); } } f.close(); } } // Keys::setKey {{{2 void Keys::setKey(const int row, const int qcode, const ushort unicode, const int width, QImage *pix) { Key * key; key = new Key; key->qcode = qcode; key->unicode = unicode; key->width = width; // share key->pressed between same keys bool found = 0; for (int i = 1; i <= 5; i++) { for (unsigned int j = 0; j < keys[i].count(); j++) if (keys[i].at(j)->qcode == qcode && keys[i].at(j)->unicode == unicode) { key->pressed = keys[i].at(j)->pressed; found = 1; } } if (!found) { key->pressed = new bool; *(key->pressed) = 0; } key->pix = pix; keys[row].append(key); } // Keys::~Keys {{{2 Keys::~Keys() { for (int i = 1; i <= 5; i++) for (unsigned int j = 0; j < keys[i].count(); j++) delete keys[i].at(j); } // Keys:: other functions {{{2 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; } int Keys::qcode(const int row, const int col) { return keys[row].at(col)->qcode; } QImage *Keys::pix(const int row, const int col) { return keys[row].at(col)->pix; } bool Keys::pressed(const int row, const int col) { return *(keys[row].at(col)->pressed); } int Keys::numKeys(const int row) { return keys[row].count(); } void Keys::setPressed(const int row, const int col, const bool pressed) { *(keys[row].at(col)->pressed) = 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; } bool *Keys::pressedPtr(const int row, const int col) { return keys[row].at(col)->pressed; } 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 @@ -1,173 +1,182 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include <qframe.h> #include <qmap.h> #include "../pickboard/pickboardcfg.h" #include "../pickboard/pickboardpicks.h" #include "configdlg.h" class QTimer; class KeyboardConfig : public DictFilterConfig { public: KeyboardConfig(PickboardPicks* p) : DictFilterConfig(p), backspaces(0) { nrows = 1; } virtual void generateText(const QString &s); void decBackspaces() { if (backspaces) backspaces--; } void incBackspaces() { backspaces++; } void resetBackspaces() { backspaces = 0; } private: int backspaces; }; class KeyboardPicks : public PickboardPicks { Q_OBJECT public: KeyboardPicks(QWidget* parent=0, const char* name=0, WFlags f=0) : PickboardPicks(parent, name, f) { } void initialise(); virtual QSize sizeHint() const; KeyboardConfig *dc; }; class Keys { 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, const int width, QImage *pix); void setPressed(const int row, const int col, const bool pressed); QString lang; QString label; private: typedef struct Key { int qcode; // are qt key codes just unicode values? ushort unicode; int width; // not pixels but relative key width. normal key is 2 // only needed for keys like ctrl that can have multiple keys pressed at once bool *pressed; QImage *pix; }; QList<Key> keys[6]; QMap<ushort,ushort> shiftMap; QMap<ushort,ushort> metaMap; + QMap<ushort,ushort> circumflexMap; + QMap<ushort,ushort> diaeresisMap; }; class Keyboard : public QFrame { Q_OBJECT public: Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 ); ~Keyboard(); void resetState(); void mousePressEvent(QMouseEvent*); void mouseReleaseEvent(QMouseEvent*); void resizeEvent(QResizeEvent*); void paintEvent(QPaintEvent* e); //void timerEvent(QTimerEvent* e); void drawKeyboard( QPainter &p, int row = -1, int col = -1); QSize sizeHint() const; signals: void key( ushort scancode, ushort unicode, ushort modifiers, bool, bool ); private slots: void repeat(); 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(); private: int getKey( int &w, int j = -1 ); void clearHighlight(); bool *shift; bool *lock; bool *ctrl; bool *alt; bool *meta; + bool *circumflex; + bool *diaeresis; + uint useLargeKeys:1; uint usePicks:1; uint useRepeat:1; int pressedKeyRow; int pressedKeyCol; KeyboardPicks *picks; int keyHeight; int defaultKeyWidth; int xoffs; int unicode; int qkeycode; int modifiers; int pressTid; bool pressed; Keys *keys; /* for korean input */ ushort schar, mchar, echar; ushort parseKoreanInput(ushort c); ushort combineKoreanChars(const ushort s, const ushort m, const ushort e); ushort constoe(const ushort c); QTimer *repeatTimer; /* colors */ void loadKeyboardColors(); QColor keycolor; QColor keycolor_pressed; QColor keycolor_lines; QColor textcolor; ConfigDlg *configdlg; }; |