1 files changed, 277 insertions, 46 deletions

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
@@ -31,26 +31,28 @@
 #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");
@@ -86,25 +88,25 @@ 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?
 
 }
 
@@ -173,78 +175,116 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int 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);
 
         QImage *pix = keys->pix(row,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);
         }
         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)) 
-                    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);
             }
             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) );
             }
@@ -280,44 +320,64 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
 
     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;
@@ -350,90 +410,184 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
             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);
-                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") {
 
         unicode = parseKoreanInput(unicode);
     }
 
     modifiers = (ctrl ? Qt::ControlButton : 0) | (alt ? Qt::AltButton : 0);
 
     if ('A' <= unicode && unicode <= 'z' && modifiers) {
 
@@ -495,33 +649,40 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*)
     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);
@@ -552,30 +713,36 @@ void Keyboard::clearHighlight()
             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();
@@ -595,67 +762,92 @@ void Keyboard::togglePickboard(bool on_off)
      * 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() {
@@ -1115,24 +1307,49 @@ void Keys::setKeysFromFile(const char * filename) {
             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;
 
@@ -1196,24 +1413,36 @@ 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) {
@@ -1229,36 +1458,38 @@ bool Keys::pressed(const int row, const int col) {
 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]) {
+    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) {
 
     return keys[row].at(col)->pressed;
 }