| -rw-r--r-- | inputmethods/multikey/keyboard.cpp | 20 |
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 @@ -363,9 +363,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e) } // 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) { @@ -381,9 +381,8 @@ void Keyboard::mousePressEvent(QMouseEvent *e) } // Accent character support - //if (unicode == 0xb4) { if (unicode == 0x2ca) { unicode = 0; if (shift || lock) { @@ -524,10 +523,10 @@ void Keyboard::mousePressEvent(QMouseEvent *e) 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; @@ -624,9 +623,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e) 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 @@ -646,9 +645,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e) if (shift) { *shift = 0; shift = 0; } if (meta) { *meta = 0; meta = 0; } - if (baccent) { *baccent = 0; } + if (baccent) { *baccent = 0; } qkeycode = 0; } @@ -662,9 +661,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e) 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))) @@ -774,8 +773,15 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*) ctrl = 0; repaint(FALSE); } + if (alt && alt != 0) { + + *alt = 0; + alt = 0; + repaint(FALSE); + + } /* * do not make the meta key release after being pressed * |