keymap dynamic loading works, but no file select dialog. remembers your selected keymap too

4 files changed, 152 insertions, 45 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index e39fa6a..68c31be 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -1,100 +1,120 @@
 /*
  * TODO
  * make a font selection thing
  *
  * FIXME
  *  if you open the config dialog and close it from the little (x) button on the title bar, 
  *  you have to hit the button on the keyboard twice for it to open the next time
  *
  *
  */
 
 #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 <qcombobox.h>
 #include "configdlg.h"
 #include "keyboard.h"
 
 ConfigDlg::ConfigDlg () : QTabWidget ()
 {
     setCaption( tr("Multikey Configuration") );
 
     /*
      * '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::Horizontal, tr("Keymap File"), gen_box);
 
-    QComboBox *combo = new QComboBox ((bool)0, map_group);
+    map_combo = new QComboBox ((bool)0, map_group);
+    map_combo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+
     QString cur(tr("Current Language"));
-    combo->insertItem(cur);
-    combo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
+    map_combo->insertItem(cur);
+    connect(map_combo, SIGNAL(activated(int)), SLOT(setMap(int)));
+
+    QString ko(tr("/opt/opie/share/multikey/ko.keymap"));
+    map_combo->insertItem(ko);
+
+    QString en(tr("/opt/opie/share/multikey/en.keymap"));
+    map_combo->insertItem(en);
 
     QPushButton *button = new QPushButton(tr("Browse..."), map_group);
     button->setFlat((bool)1);
 
     pick_button = new QCheckBox(tr("Pickboard"), gen_box);
 
     Config config ("multikey");
     config.setGroup ("pickboard");
     bool pick_open = config.readBoolEntry ("open", "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()));
 
     /*
      * 'color' tab
      */
 
     QGrid *color_box = new QGrid(2, this);
     color_box->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
     color_box->setMargin(3);
     addTab(color_box, tr("Colors"));
 
     QLabel *label;
 
     label = new QLabel(tr("Key Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
     label = new QLabel(tr("Key Pressed Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
     label = new QLabel(tr("Line Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
     label = new QLabel(tr("Text Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
 
     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 ("pickboard");
     config.writeEntry ("open", pick_button->isChecked()); // default closed
 
     emit pickboardToggled(pick_button->isChecked());
 }
+
+void ConfigDlg::setMap(int index) {
+
+    if (index == 0) {
+
+        emit setMapToDefault();
+    }
+    else {
+
+        emit setMapToFile(map_combo->text(index));
+    }
+}
diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h
index 21bdb17..54127a0 100644
--- a/inputmethods/multikey/configdlg.h
+++ b/inputmethods/multikey/configdlg.h
@@ -1,26 +1,31 @@
 #include <qpe/qpeapplication.h>
 #include <qtabwidget.h>
 #include <qcheckbox.h>
+#include <qcombobox.h>
 
 #ifndef CONFIGDLG_H
 #define CONFIGDLG_H
 
 class ConfigDlg : public QTabWidget
 {
     Q_OBJECT
 
 public:
     ConfigDlg ();
 
 signals:
     void pickboardToggled(bool on_off);
+    void setMapToDefault();
+    void setMapToFile(QString file);
 
 private slots:
     void pickTog();
+    void setMap(int index);
 
 private:
     QCheckBox *pick_button;
+    QComboBox *map_combo;
 
 };
 
 #endif
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index a19f07a..1d91b82 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -1,587 +1,632 @@
 /**********************************************************************
 ** 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 <iostream.h>
 
 #include <sys/utsname.h>
 
 
 #define USE_SMALL_BACKSPACE
 
 /* Keyboard::Keyboard {{{1 */
 Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     QFrame(parent, _name, f),  shift(0), lock(0), ctrl(0),
     alt(0), useLargeKeys(TRUE), usePicks(0), pressedKeyRow(-1), pressedKeyCol(-1),
-    unicode(-1), qkeycode(0), modifiers(0), LANG("ko"), schar(0), mchar(0), echar(0),
+    unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
     configdlg(0)
 
 {
     // get the default font
-    Config qpeConfig( "qpe" );
-    qpeConfig.setGroup( "Appearance" );
-    QString familyStr = qpeConfig.readEntry( "FontFamily", "fixed" );
+    Config *config = new Config( "qpe" );
+    config->setGroup( "Appearance" );
+    QString familyStr = config->readEntry( "FontFamily", "fixed" );
+    delete config;
 
-    Config multiConfig ("multikey");
-    multiConfig.setGroup ("pickboard");
-    usePicks = multiConfig.readBoolEntry ("open", "0"); // default closed
+    config = new Config("multikey");
+    config->setGroup ("pickboard");
+    usePicks = config->readBoolEntry ("open", "0"); // default closed
+    delete config;
 
     setFont( QFont( familyStr, 8 ) );
 
     picks = new KeyboardPicks( this );
     picks->setFont( QFont( familyStr, 8 ) );
     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();
 
-    Config config("locale");
-    config.setGroup( "Language" );
-    LANG = config.readEntry( "Language", "en" );
+    keys = new Keys();
 
     repeatTimer = new QTimer( this );
     connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
 
 }
 
 /* Keyboard::resizeEvent {{{1 */
 void Keyboard::resizeEvent(QResizeEvent*)
 {
     int ph = picks->sizeHint().height();
     picks->setGeometry( 0, 0, width(), ph );
     keyHeight = (height()-(usePicks ? ph : 0))/5;
 
     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)
 {
     QColor keycolor = 
                             QColor(240,240,240); 
     QColor keycolor_pressed = QColor(171,183,198);
     QColor keycolor_lines = QColor(138,148,160);
     QColor textcolor = QColor(43,54,68);
 
 
     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;
+            x += keys->width(row, i) * defaultKeyWidth;
         }
         int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0);
 
-        int keyWidth = keys.width(row, col);
+        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);
+                   pressed || keys->pressed(row, col) ? keycolor_pressed : keycolor);
 
-        QPixmap *pix = keys.pix(row,col);
+        QPixmap *pix = keys->pix(row,col);
 
-        ushort c = keys.uni(row, col);
+        ushort c = keys->uni(row, col);
 
         if (!pix) {
             p.setPen(textcolor);
             p.drawText(x, y, 
                defaultKeyWidth * keyWidth, keyHeight,
-               AlignCenter, ((shift || lock) && keys.shift(c)) ? (QChar)keys.shift(c) : (QChar)c);
+               AlignCenter, ((shift || lock) && keys->shift(c)) ? (QChar)keys->shift(c) : (QChar)c);
         }
         else
             // center the image in the middle of the key
             p.drawPixmap( x + (defaultKeyWidth * keyWidth - pix->width())/2, 
                           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++) {
 
         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++) {
+        for (int col = 0; col < keys->numKeys(row); col++) {
 
-            QPixmap *pix = keys.pix(row, col);
-            int keyWidth = keys.width(row, col);
+            QPixmap *pix = keys->pix(row, col);
+            int keyWidth = keys->width(row, col);
 
 
             int keyWidthPix = defaultKeyWidth * keyWidth;
 
-            if (keys.pressed(row, col)) 
+            if (keys->pressed(row, col)) 
                 p.fillRect(x+1, y+1, keyWidthPix - 1, 
                            keyHeight - 1, keycolor_pressed);
 
-            ushort c = keys.uni(row, col);
+            ushort c = keys->uni(row, col);
 
             if (!pix) {
                 p.setPen(textcolor);
                 p.drawText(x, y, 
                    keyWidthPix, keyHeight,
-                   AlignCenter, ((shift || lock) && keys.shift(c)) ? (QChar)keys.shift(c) : (QChar)c);
+                   AlignCenter, ((shift || lock) && keys->shift(c)) ? (QChar)keys->shift(c) : (QChar)c);
             }
             else {
                 // center the image in the middle of the key
                 p.drawPixmap( x + (keyWidthPix - pix->width())/2, 
                               y + (keyHeight - pix->height())/2 + 1, 
                               QPixmap(*pix) );
             }
 
             p.setPen(keycolor_lines);
             p.drawLine(x, y, x, y + keyHeight);
 
             x += keyWidthPix;
         }
 
 
     }
     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;
+        if (col < keys->numKeys(row)) // it segfaults if it trys to read past numKeys
+            w += keys->width(row,col) * defaultKeyWidth;
         else break;
 
     col --; // rewind one...
 
-    qkeycode = keys.qcode(row, col);
-    unicode = keys.uni(row, col);
+    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; 
 
     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(pickboardToggled(bool)), 
                        this, SLOT(togglePickboard(bool)));
+               connect(configdlg, SIGNAL(setMapToDefault()), 
+                       this, SLOT(setMapToDefault()));
+               connect(configdlg, SIGNAL(setMapToFile(QString)), 
+                       this, SLOT(setMapToFile(QString)));
                configdlg->showMaximized();
                configdlg->show();
                configdlg->raise();
             }
 
         } else if (qkeycode == Qt::Key_Control) {
-            ctrl = keys.pressedPtr(row, col);
+            ctrl = keys->pressedPtr(row, col);
             need_repaint = TRUE;
-            *ctrl = !keys.pressed(row, col);
+            *ctrl = !keys->pressed(row, col);
 
         } else if (qkeycode == Qt::Key_Alt) {
-            alt = keys.pressedPtr(row, col);
+            alt = keys->pressedPtr(row, col);
             need_repaint = TRUE;
-            *alt = !keys.pressed(row, col);
+            *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 = keys->pressedPtr(row, col);
                 *shift = 1;
                 if (lock) {
                     *lock = 0;
                     lock = 0;
                 }
             }
 
         } else if (qkeycode == Qt::Key_CapsLock) {
             need_repaint = TRUE;
 
             if (lock) {
                 *lock = 0;
                 lock = 0;
             }
             else {
-                lock = keys.pressedPtr(row, col);;
+                lock = keys->pressedPtr(row, col);;
                 *lock = 1;
                 if (shift) {
                     *shift = 0;
                     shift = 0;
                 }
             }
 
         }
 
     }
     else { // normal char
-        if ((shift || lock) && keys.shift(unicode)) {
-            unicode = keys.shift(unicode);
+        if ((shift || lock) && keys->shift(unicode)) {
+            unicode = keys->shift(unicode);
         }
     }
 
     // korean parsing
-    if (LANG == "ko") {
+    if (keys->lang == "ko") {
 
         unicode = parseKoreanInput(unicode);
     }
 
     modifiers = (ctrl ? Qt::ControlButton : 0) | (alt ? Qt::AltButton : 0);
 
     emit key(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);
 
     }
 
     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 
 
     clearHighlight();
 }
 
 /* Keyboard::timerEvent {{{1 */
 /*
 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, 0, 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();
 
     return QSize( 240, keyHeight * 5 + (usePicks ? picks->sizeHint().height() : 0) + 1);
 }
 
 
 void Keyboard::resetState()
 {
     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()");
 }
 
+/* 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/" 
+            + l + ".keymap";
+
+    /* save change to multikey config file */
+    config = new Config("multikey");
+    config->setGroup ("keymaps");
+    config->writeEntry ("current", key_map); // default closed
+    delete config;
+
+    delete keys;
+    keys = new Keys(key_map);
+
+    // have to repaint the keyboard
+    repaint(FALSE);
+}
+
+void Keyboard::setMapToFile(QString file) {
+
+    /* save change to multikey config file */
+    Config *config = new Config("multikey");
+    config->setGroup ("keymaps");
+    config->writeEntry ("current", file); // default closed
+    delete config;
+
+    delete keys;
+    keys = new Keys(file);
+    repaint(FALSE);
+
+}
+
 /* 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) { // ¤©
 
                                                 if (c == 0x1100)        echar = 0x11b0; // ¤© + ¤¡
                                                 else if (c == 0x1106) echar = 0x11b1; // ¤© + ¤±
                                                 else if (c == 0x1107) echar = 0x11b2; // ¤© + ¤²
                                                 else if (c == 0x1109) echar = 0x11b3; // ¤© + ¤µ
                                                 else if (c == 0x1110) echar = 0x11b4; // ¤© + ¤¼
                                                 else if (c == 0x1111) echar = 0x11b5; // ¤© + ¤½
                                                 else if (c == 0x1112) echar = 0x11b6; // ¤© + ¤¾
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return c;
                                         }
 
                                 } else if (echar == 0x11b8) { // ¤²
 
                                                 if (c == 0x1109)        echar = 0x11b9; // ¤² + ¤µ
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return c;
@@ -702,282 +747,315 @@ ushort Keyboard::parseKoreanInput (ushort c) {
                                         if (constoe(echar)) {
 
                                                 prev = combineKoreanChars(schar, mchar, 0);
                                                 schar = constoe(echar); 
                                         } 
                                         break;
                         }
                         
                         emit key( prev, prev, 0, true, false );
 
                         mchar = c; echar = 0;
 
                         return combineKoreanChars(schar, mchar, 0);
                 
                 } 
                 else {
                         schar = 0; mchar = 0; echar = 0;
                         return c;
                 }
 
         } 
         else /*if (c == ' ')*/ return c;
 
 
         // and now... finally delete previous char, and return new char
         emit key( 8, Qt::Key_Backspace, 0, true, false );
 
 
         return combineKoreanChars( schar, mchar, echar);
 
 }
 
 ushort Keyboard::combineKoreanChars(const ushort s, const ushort m, const ushort e) {
 
         return ((s - 0x1100) * 588) + ((m - 0x1161) * 28) + (e ? e - 0x11a7 : 0) + 0xac00;
 
 }
 
 ushort Keyboard::constoe(const ushort c) {
 
         // converts schars to echars if possible
 
         if (0x1100 <= c && c <= 0x1112) { // schar to echar
 
                 switch (c) {
                         case 0x1100: return 0x11a8;
                         case 0x1101: return 0x11a9;
                         case 0x1102: return 0x11ab;
                         case 0x1103: return 0x11ae;
                         case 0x1105: return 0x11af;
                         case 0x1106: return 0x11b7;
                         case 0x1107: return 0x11b8;
                         case 0x1109: return 0x11ba;
                         case 0x110a: return 0x11bb;
                         case 0x110b: return 0x11bc;
                         case 0x110c: return 0x11bd;
                         case 0x110e: return 0x11be;
                         case 0x110f: return 0x11bf;
                         case 0x1110: return 0x11c0;
                         case 0x1111: return 0x11c1;
                         case 0x1112: return 0x11c2;
                         default: return 0;
 
                 }
 
         } else { //echar to schar
 
                 switch (c) {
                         case 0x11a8: return 0x1100;
                         case 0x11a9: return 0x1101;
                         case 0x11ab: return 0x1102;
                         case 0x11ae: return 0x1103;
                         case 0x11af: return 0x1105;
                         case 0x11b7: return 0x1106;
                         case 0x11b8: return 0x1107;
                         case 0x11ba: return 0x1109;
                         case 0x11bb: return 0x110a;
                         case 0x11bc: return 0x110b;
                         case 0x11bd: return 0x110c;
                         case 0x11be: return 0x110e;
                         case 0x11bf: return 0x110f;
                         case 0x11c0: return 0x1110;
                         case 0x11c1: return 0x1111;
                         case 0x11c2: return 0x1112;
                         default: return 0;
 
                 }
 
         }
 }
 
 
 // Keys::Keys {{{1
 
 Keys::Keys() {
 
-    Config config("locale");
-    config.setGroup( "Language" );
-    QString l = config.readEntry( "Language" , "en" );
+    Config *config = new Config ("multikey");
+    config->setGroup( "keymaps" );
+    QString key_map = config->readEntry( "current" );
+    delete config;
+
+    if (key_map.isNull()) {
+
+        Config *config = new Config("locale");
+        config->setGroup( "Language" );
+        QString l = config->readEntry( "Language" , "en" );
+        delete config;
+    
+        key_map = QPEApplication::qpeDir() + "/share/multikey/" 
+                + l + ".keymap";
+
+    }
 
-    QString key_map = QPEApplication::qpeDir() + "/share/multikey/" 
-            + l + ".keymap";
 
     setKeysFromFile(key_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?
         QPixmap *xpm2pix = 0;
 
         buf = t.readLine();
         while (buf) {
 
+            // 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 QPixmap((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();
             }
+
+            // 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;
+
+                } 
+
+                cout << name << " = " << value << "\n";
+                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, QPixmap *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:: other functions {{{2
 int Keys::width(const int row, const int col) {
     
     return keys[row].at(col)->width;
 
 }
 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;
 }
 
 QPixmap *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;
 
 }
 
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index e61b76c..c2efe10 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -1,152 +1,156 @@
 /**********************************************************************
 ** 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);
     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);
     QPixmap *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, QPixmap *pix);
     void    setPressed(const int row, const int col, const bool pressed);
+    QString lang;
+    QString title;
 
 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; 
             QPixmap *pix;
     };
 
     QList<Key> keys[6];
     QMap<ushort,ushort> shiftMap;
 
 };
 
 class Keyboard : public QFrame
 {
     Q_OBJECT
 public:
     Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 );
 
     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 setMapToDefault();
+    void setMapToFile(QString file);
     
 private:
     int getKey( int &w, int j = -1 );
     void clearHighlight();
 
     bool *shift;
     bool *lock;
     bool *ctrl;
     bool *alt;
     uint useLargeKeys:1;
     uint usePicks: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;
-    QString LANG;
+    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;
 
     ConfigDlg *configdlg;
 };