2 files changed, 13 insertions, 12 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index e3d3928..3f6f73b 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -132,166 +132,167 @@ void  KeyboardConfig::generateText(const QString &s)
     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);
 
-        QPixmap *pix = keys->pix(row,col);
+        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) {
 
                 c = keys->meta(c);
             }
             p.drawText(x, y, 
                defaultKeyWidth * keyWidth + 3, keyHeight,
                AlignCenter, (QChar)c);
         }
         else
             // center the image in the middle of the key
-            p.drawPixmap( x + (defaultKeyWidth * keyWidth - pix->width())/2, 
+            p.drawImage( 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++) {
 
-            QPixmap *pix = keys->pix(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);
                 else if (meta && keys->meta(c)) 
                     c = keys->meta(c);
 
                 p.drawText(x, y, 
                    keyWidthPix + 3, keyHeight,
                    AlignCenter, (QChar)c);
             }
             else {
                 // center the image in the middle of the key
-                p.drawPixmap( x + (keyWidthPix - pix->width())/2, 
+                pix->setColor(1, textcolor.rgb());
+                p.drawImage( x + (keyWidthPix - pix->width())/2, 
                               y + (keyHeight - pix->height())/2 + 1, 
-                              QPixmap(*pix) );
+                              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; 
 
     if (unicode == 0) { // either Qt char, or nothing
 
         if (qkeycode == Qt::Key_F1) { // toggle the pickboard
 
             if ( configdlg ) { 
                 delete (ConfigDlg *) configdlg; 
@@ -999,266 +1000,266 @@ 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?
-        QPixmap *xpm2pix = 0;
+        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 QPixmap((const char **)xpm);
+                    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();
             }
 
             // 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, QPixmap *pix) {
+                    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;
 
 }
 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) {
+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;
 
 }
 
 ushort Keys::meta(const ushort uni) {
 
     if (metaMap[uni]) {
 
         return metaMap[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 b692975..1aa7a35 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -18,115 +18,115 @@
 **
 **********************************************************************/
 #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();
     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);
-    QPixmap *pix(const int row, const int col);
+    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, QPixmap *pix);
+                    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; 
-            QPixmap *pix;
+            QImage *pix;
     };
 
     QList<Key> keys[6];
     QMap<ushort,ushort> shiftMap;
     QMap<ushort,ushort> metaMap;
 
 };
 
 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);
 
     // 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;