ctrl and alt keys should work now

2 files changed, 8 insertions, 1 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 89b713e..a9137b9 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -1,132 +1,133 @@
 /*
  * TODO
  * make a font selection thing (size too)
  * make a cursor thing
+ * add meta key support for german, etc
  *
  *
  *
  */
 
 #include <iostream.h>
 
 #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++) {
 
         keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]);
         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 {
 
             keymaps->insertItem(custom_maps[i]);
             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) {
 
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 7334c1c..949164a 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -233,257 +233,263 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
             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;
         else break;
 
     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; 
 
     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()));
                configdlg->showMaximized();
                configdlg->show();
                configdlg->raise();
             }
 
         } else if (qkeycode == Qt::Key_Control) {
             ctrl = keys->pressedPtr(row, col);
             need_repaint = TRUE;
             *ctrl = !keys->pressed(row, col);
 
         } else if (qkeycode == Qt::Key_Alt) {
             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;
                 }
             }
 
         } else if (qkeycode == Qt::Key_CapsLock) {
             need_repaint = TRUE;
 
             if (lock) {
                 *lock = 0;
                 lock = 0;
             }
             else {
                 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);
         }
     }
 
     // korean parsing
     if (keys->lang == "ko") {
 
         unicode = parseKoreanInput(unicode);
     }
 
     modifiers = (ctrl ? Qt::ControlButton : 0) | (alt ? Qt::AltButton : 0);
 
-    emit key(unicode, qkeycode, modifiers, true, false); 
+    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 
 
     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);
 }
 
 
 void Keyboard::resetState()
 {
     schar = mchar = echar = 0;
     picks->resetState();
 }
 
 /* Keyboard::togglePickboard {{{1 */
 void Keyboard::togglePickboard(bool on_off)
 {
     usePicks = on_off;