korean support only

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
@@ -425,97 +425,98 @@ void Keyboard::timerEvent(QTimerEvent* e)
 }
 */
 
 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
@@ -725,98 +726,97 @@ ushort Keyboard::constoe(const ushort c) {
                         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*\".*\""))) {