3 files changed, 53 insertions, 20 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 8f4d562..a19f07a 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -1,98 +1,106 @@
 /**********************************************************************
 ** 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 <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), LANG("ko"), 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 multiConfig ("multikey");
+    multiConfig.setGroup ("pickboard");
+    usePicks = multiConfig.readBoolEntry ("open", "0"); // default closed
+
     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" );
 
     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);
 }
 
@@ -217,117 +225,109 @@ 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
 
-            usePicks = !usePicks;
-            if (usePicks) {
-                picks->show();
-                move(x(), y() - picks->height());
-                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)) );
-
+            if ( configdlg ) { 
+                delete (ConfigDlg *) configdlg; 
+                configdlg = 0;
+            }
+            else {
+               configdlg = new ConfigDlg ();
+               connect(configdlg, SIGNAL(pickboardToggled(bool)), 
+                       this, SLOT(togglePickboard(bool)));
+               configdlg->showMaximized();
+               configdlg->show();
+               configdlg->raise();
             }
 
-            keys.setPressed(row, col, usePicks);
-            need_repaint = TRUE;
-            qkeycode = 0; // don't need to emit Key_F1
         } 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);
@@ -417,96 +417,123 @@ 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()");
+}
+
 /* 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) {
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index b524195..e61b76c 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -1,148 +1,152 @@
 /**********************************************************************
 ** 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);
 
 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);
     
 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;
     /* 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;
 };
 
 
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 2e92e06..9d76a3d 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -1,29 +1,31 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   keyboard.h \
+            configdlg.h \
             ../pickboard/pickboardcfg.h \
             ../pickboard/pickboardpicks.h \
             keyboardimpl.h 
         SOURCES=   keyboard.cpp \
+            configdlg.cpp \
             ../pickboard/pickboardcfg.cpp \
             ../pickboard/pickboardpicks.cpp \
             keyboardimpl.cpp
         TARGET  = qmultikey
         DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS    = ../../i18n/pt_BR/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/de/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/en/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/hu/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/sl/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/ja/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/ko/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/pl/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/no/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/zh_CN/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/zh_TW/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/fr/libqmultikey.ts