| -rw-r--r-- | inputmethods/multikey/keyboard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 3e43978..d0cfa51 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp @@ -377,193 +377,194 @@ void Keyboard::mousePressEvent(QMouseEvent *e) 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(); } /* 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 a kor/eng swaping key + * 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; } } else if (echar == 0x11ba) { // ¤µ if (c == 0x1109) echar = 0x11bb; // ¤µ + ¤µ else { schar = c; mchar = 0; echar = 0; return c; } @@ -677,194 +678,193 @@ ushort Keyboard::parseKoreanInput (ushort c) { 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" ); - if(l.isEmpty()) l = "en"; + QString l = config.readEntry( "Language" , "en" ); QString key_map = QPEApplication::qpeDir() + "/share/multikey/" + /* l // testing korean for now */ + "ko.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) { 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); } 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(); } else if (buf.contains(QRegExp("^\\s*#"))) { buf = t.readLine(); } else { // blank line, or garbage buf = t.readLine(); |