author | hash <hash> | 2002-11-08 05:48:13 (UTC) |
---|---|---|
committer | hash <hash> | 2002-11-08 05:48:13 (UTC) |
commit | 585e766bcb974079957dabcbaf487c21211caa8b (patch) (unidiff) | |
tree | 672f8670a0ec70b3e7ff3a079800bc12d9f82f8e | |
parent | 6cb72a24dead3f2f1a122cbe6e9dcc43be86443a (diff) | |
download | opie-585e766bcb974079957dabcbaf487c21211caa8b.zip opie-585e766bcb974079957dabcbaf487c21211caa8b.tar.gz opie-585e766bcb974079957dabcbaf487c21211caa8b.tar.bz2 |
alt shouldnt stick either
-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 | |||
@@ -365,5 +365,5 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
365 | // Back accent character support | 365 | // Back accent character support |
366 | 366 | ||
367 | //if (unicode == 0x60) { // the keys from 2c6 ~ 2cf should be used instead of the ascii one | 367 | // the keys from 2c6 ~ 2cf should be used instead of the ascii one |
368 | if (unicode == 0x2cb) { | 368 | if (unicode == 0x2cb) { |
369 | 369 | ||
@@ -383,5 +383,4 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
383 | // Accent character support | 383 | // Accent character support |
384 | 384 | ||
385 | //if (unicode == 0xb4) { | ||
386 | if (unicode == 0x2ca) { | 385 | if (unicode == 0x2ca) { |
387 | 386 | ||
@@ -526,6 +525,6 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
526 | if (circumflex) { *circumflex = 0; circumflex = 0; } | 525 | if (circumflex) { *circumflex = 0; circumflex = 0; } |
527 | if (diaeresis) { *diaeresis = 0; diaeresis = 0; } | 526 | if (diaeresis) { *diaeresis = 0; diaeresis = 0; } |
528 | if (baccent) { *baccent = 0; baccent = 0; } | 527 | if (baccent) { *baccent = 0; baccent = 0; } |
529 | if (accent) { *accent = 0; accent = 0; } | 528 | if (accent) { *accent = 0; accent = 0; } |
530 | 529 | ||
531 | // dont need to emit this key... acts same as alt | 530 | // dont need to emit this key... acts same as alt |
@@ -626,5 +625,5 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
626 | if (shift) { *shift = 0; shift = 0; } | 625 | if (shift) { *shift = 0; shift = 0; } |
627 | if (meta) { *meta = 0; meta = 0; } | 626 | if (meta) { *meta = 0; meta = 0; } |
628 | if (accent) { *accent = 0; accent = 0; } | 627 | if (accent) { *accent = 0; accent = 0; } |
629 | 628 | ||
630 | qkeycode = 0; | 629 | qkeycode = 0; |
@@ -648,5 +647,5 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
648 | if (shift) { *shift = 0; shift = 0; } | 647 | if (shift) { *shift = 0; shift = 0; } |
649 | if (meta) { *meta = 0; meta = 0; } | 648 | if (meta) { *meta = 0; meta = 0; } |
650 | if (baccent) { *baccent = 0; } | 649 | if (baccent) { *baccent = 0; } |
651 | 650 | ||
652 | qkeycode = 0; | 651 | qkeycode = 0; |
@@ -664,5 +663,5 @@ void Keyboard::mousePressEvent(QMouseEvent *e) | |||
664 | else if (diaeresis && keys->diaeresis(keys->shift(unicode))) | 663 | else if (diaeresis && keys->diaeresis(keys->shift(unicode))) |
665 | unicode = keys->diaeresis(keys->shift(unicode)); | 664 | unicode = keys->diaeresis(keys->shift(unicode)); |
666 | else if (baccent && keys->baccent(keys->shift(unicode))) | 665 | else if (baccent && keys->baccent(keys->shift(unicode))) |
667 | unicode = keys->baccent(keys->shift(unicode)); | 666 | unicode = keys->baccent(keys->shift(unicode)); |
668 | else if (accent && keys->accent(keys->shift(unicode))) | 667 | else if (accent && keys->accent(keys->shift(unicode))) |
@@ -776,4 +775,11 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*) | |||
776 | 775 | ||
777 | } | 776 | } |
777 | if (alt && alt != 0) { | ||
778 | |||
779 | *alt = 0; | ||
780 | alt = 0; | ||
781 | repaint(FALSE); | ||
782 | |||
783 | } | ||
778 | 784 | ||
779 | /* | 785 | /* |