1. changed format from EUC-KR to UTF-8 (sorry about that)

2. made ctrl unsticky
3. the spanish accent and back accent shouldnt be the normal backtick char, so
   i changed them to the chars in 0x2c6 ~ 0x2cf (extended ticks and stuff)

1 files changed, 33 insertions, 24 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index de3aa52..08318bd 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -355,42 +355,44 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
             // diaeresis
             qkeycode = 0x2001; 
         }
         else {
             
             // circumflex
             qkeycode = 0x2000; 
         }
     }
 
     // Back accent character support
 
-    if (unicode == 0x60) {
+    //if (unicode == 0x60) { // the keys from 2c6 ~ 2cf should be used instead of the ascii one
+    if (unicode == 0x2cb) {
 
         unicode = 0;
         if (shift || lock) {
 
             // circumblex
             qkeycode = 0x2000;
         }
         else {
 
             // back accent
             qkeycode = 0x2002;
         }
     }
 
     // Accent character support
 
-    if (unicode == 0xb4) {
+    //if (unicode == 0xb4) {
+    if (unicode == 0x2ca) {
 
         unicode = 0;
         if (shift || lock) {
 
             // diaeresis
             qkeycode = 0x2001;
         }
         else {
 
             // accent
             qkeycode = 0x2003;
         }
@@ -757,24 +759,31 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*)
         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);
 
     } 
+    if (ctrl && unicode != 0) {
+
+        *ctrl = 0;
+        ctrl = 0;
+        repaint(FALSE);
+
+    }
     
     /*
      * do not make the meta key release after being pressed
      *
 
     else if (meta && unicode != 0) {
 
         *meta = 0;
         meta = 0;
         repaint(FALSE);
     }
 
@@ -1006,27 +1015,27 @@ void Keyboard::loadKeyboardColors() {
  * 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)
+ * ģ“ˆģŒ = 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)) 
@@ -1048,67 +1057,67 @@ ushort Keyboard::parseKoreanInput (ushort c) {
 
                         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 (echar == 0x11a8) { // 愱
 
-                                                if (c == 0x1100)        echar = 0x11a9; // ¤” + ¤”
-                                                else if (c == 0x1109) echar = 0x11aa; // ¤” + ¤µ
+                                                if (c == 0x1100)        echar = 0x11a9; // 愱 + 愱
+                                                else if (c == 0x1109) echar = 0x11aa; // 愱 + 慅
                                         else { 
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return c;
                                         }
 
-                                } else if (echar == 0x11ab) { // ¤¤
+                                } else if (echar == 0x11ab) { // ć„“
 
-                                                if (c == 0x110c)        echar = 0x11ac; // ¤¤ + ¤ø
-                                                else if (c == 0x1112)  echar = 0x11ad; // ¤¤ + ¤¾
+                                                if (c == 0x110c)        echar = 0x11ac; // ć„“ + 慈
+                                                else if (c == 0x1112)  echar = 0x11ad; // ć„“ + 慎
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return c;
                                         }
 
-                                } else if (echar == 0x11af) { // ¤©
+                                } 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; // ¤© + ¤¾
+                                                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) { // ¤²
+                                } else if (echar == 0x11b8) { // 慂
 
-                                                if (c == 0x1109)        echar = 0x11b9; // ¤² + ¤µ
+                                                if (c == 0x1109)        echar = 0x11b9; // 慂 + 慅
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return c;
                                         }
 
-                                } else if (echar == 0x11ba) { // ¤µ 
+                                } else if (echar == 0x11ba) { // 慅 
 
-                                                if (c == 0x1109)        echar = 0x11bb; // ¤µ + ¤µ 
+                                                if (c == 0x1109)        echar = 0x11bb; // 慅 + 慅 
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return c;
                                         }
 
                                 } else { // if any other char, cannot combine chars
 
                                         schar = c; mchar = 0; echar = 0;
                                         return c;
                                 }
 
                                 unicode = echar;
@@ -1453,25 +1462,25 @@ void Keys::setKeysFromFile(const char * filename) {
                 buf = t.readLine();
             }
             // back accent
             else if (buf.contains(QRegExp("^\\s*b\\s+[0-9a-fx]+\\s+[0-9a-fx]+\\s*$", FALSE, FALSE))) {
 
                 QTextStream tmp (buf, IO_ReadOnly);
                 ushort lower, shift;
                 QChar d;
                 tmp >> d >> lower >> shift;
 
                 baccentMap.insert(lower, shift);
 
-                qDebug ("Estoy ańadiendo %i con %i", lower, shift);
+                qDebug ("Estoy aadiendo %i con %i", lower, shift);
                 buf = t.readLine();
             }
             // accent
             else if (buf.contains(QRegExp("^\\s*a\\s+[0-9a-fx]+\\s+[0-9a-fx]+\\s*$", FALSE, FALSE))) {
 
                 QTextStream tmp (buf, IO_ReadOnly);
                 ushort lower, shift;
                 QChar d;
                 tmp >> d >> lower >> shift;
 
                 accentMap.insert(lower, shift);