alt shouldnt stick either

1 files changed, 13 insertions, 7 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 08318bd..84c0c74 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -359,17 +359,17 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
             
             // circumflex
             qkeycode = 0x2000; 
         }
     }
 
     // Back accent character support
 
-    //if (unicode == 0x60) { // the keys from 2c6 ~ 2cf should be used instead of the ascii one
+    // the keys from 2c6 ~ 2cf should be used instead of the ascii one
     if (unicode == 0x2cb) {
 
         unicode = 0;
         if (shift || lock) {
 
             // circumblex
             qkeycode = 0x2000;
         }
@@ -377,17 +377,16 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
 
             // back accent
             qkeycode = 0x2002;
         }
     }
 
     // Accent character support
 
-    //if (unicode == 0xb4) {
     if (unicode == 0x2ca) {
 
         unicode = 0;
         if (shift || lock) {
 
             // diaeresis
             qkeycode = 0x2001;
         }
@@ -520,18 +519,18 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
                 *meta = true;
             }
 
             // reset all the other keys
             if (shift) { *shift = 0; shift = 0; } 
             if (lock) { *lock = 0; lock = 0; }
             if (circumflex) { *circumflex = 0; circumflex = 0; }
             if (diaeresis) { *diaeresis = 0; diaeresis = 0; }
-	       if (baccent) { *baccent = 0; baccent = 0; }
-	       if (accent) { *accent = 0; accent = 0; }
+	        if (baccent) { *baccent = 0; baccent = 0; }
+	        if (accent) { *accent = 0; accent = 0; }
 
             // dont need to emit this key... acts same as alt
             qkeycode = 0;
 
         // circumflex
         } else if (qkeycode == 0x2000) {
             need_repaint = TRUE;
 
@@ -620,17 +619,17 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
 
                 baccent = keys->pressedPtr(row, col);
                 *baccent = true;
             }
 
 
             if (shift) { *shift = 0; shift = 0; }
             if (meta) { *meta = 0; meta = 0; }
-		  if (accent) { *accent = 0; accent = 0; }
+		    if (accent) { *accent = 0; accent = 0; }
 
             qkeycode = 0;
         
 	   // Accent
         } else if (qkeycode == 0x2003) {
             need_repaint = TRUE;
 
             if (accent) {
@@ -642,33 +641,33 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
 
                 accent = keys->pressedPtr(row, col);
                 *accent = true;
             }
 
 
             if (shift) { *shift = 0; shift = 0; }
             if (meta) { *meta = 0; meta = 0; }
-		  if (baccent) { *baccent = 0; }
+		    if (baccent) { *baccent = 0; }
 
             qkeycode = 0;
         }
 
     }
     else { // normal char
         if ((shift || lock) && keys->shift(unicode)) {
 
             // make diaeresis/circumflex -> shift input shifted
             // diaeresis/circumflex chars
             
             if (circumflex && keys->circumflex(keys->shift(unicode)))
                 unicode = keys->circumflex(keys->shift(unicode));
             else if (diaeresis && keys->diaeresis(keys->shift(unicode)))
                 unicode = keys->diaeresis(keys->shift(unicode));
-	    else if (baccent && keys->baccent(keys->shift(unicode)))
+	        else if (baccent && keys->baccent(keys->shift(unicode)))
                 unicode = keys->baccent(keys->shift(unicode));
             else if (accent && keys->accent(keys->shift(unicode)))
                 unicode = keys->accent(keys->shift(unicode));
             else if (meta && keys->meta(keys->shift(unicode)))
                 unicode = keys->meta(keys->shift(unicode));
             else
                 unicode = keys->shift(unicode);
         }
@@ -770,16 +769,23 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*)
     } 
     if (ctrl && unicode != 0) {
 
         *ctrl = 0;
         ctrl = 0;
         repaint(FALSE);
 
     }
+    if (alt && alt != 0) {
+
+        *alt = 0;
+        alt = 0;
+        repaint(FALSE);
+
+    }
     
     /*
      * do not make the meta key release after being pressed
      *
 
     else if (meta && unicode != 0) {
 
         *meta = 0;