summaryrefslogtreecommitdiff
authorhash <hash>2002-11-08 05:48:13 (UTC)
committer hash <hash>2002-11-08 05:48:13 (UTC)
commit585e766bcb974079957dabcbaf487c21211caa8b (patch) (unidiff)
tree672f8670a0ec70b3e7ff3a079800bc12d9f82f8e
parent6cb72a24dead3f2f1a122cbe6e9dcc43be86443a (diff)
downloadopie-585e766bcb974079957dabcbaf487c21211caa8b.zip
opie-585e766bcb974079957dabcbaf487c21211caa8b.tar.gz
opie-585e766bcb974079957dabcbaf487c21211caa8b.tar.bz2
alt shouldnt stick either
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp20
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)
363 } 363 }
364 364
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
370 unicode = 0; 370 unicode = 0;
371 if (shift || lock) { 371 if (shift || lock) {
@@ -381,9 +381,8 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
381 } 381 }
382 382
383 // Accent character support 383 // Accent character support
384 384
385 //if (unicode == 0xb4) {
386 if (unicode == 0x2ca) { 385 if (unicode == 0x2ca) {
387 386
388 unicode = 0; 387 unicode = 0;
389 if (shift || lock) { 388 if (shift || lock) {
@@ -524,10 +523,10 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
524 if (shift) { *shift = 0; shift = 0; } 523 if (shift) { *shift = 0; shift = 0; }
525 if (lock) { *lock = 0; lock = 0; } 524 if (lock) { *lock = 0; lock = 0; }
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
532 qkeycode = 0; 531 qkeycode = 0;
533 532
@@ -624,9 +623,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
624 623
625 624
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;
631 630
632 // Accent 631 // Accent
@@ -646,9 +645,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
646 645
647 646
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;
653 } 652 }
654 653
@@ -662,9 +661,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
662 if (circumflex && keys->circumflex(keys->shift(unicode))) 661 if (circumflex && keys->circumflex(keys->shift(unicode)))
663 unicode = keys->circumflex(keys->shift(unicode)); 662 unicode = keys->circumflex(keys->shift(unicode));
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)))
669 unicode = keys->accent(keys->shift(unicode)); 668 unicode = keys->accent(keys->shift(unicode));
670 else if (meta && keys->meta(keys->shift(unicode))) 669 else if (meta && keys->meta(keys->shift(unicode)))
@@ -774,8 +773,15 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*)
774 ctrl = 0; 773 ctrl = 0;
775 repaint(FALSE); 774 repaint(FALSE);
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 /*
780 * do not make the meta key release after being pressed 786 * do not make the meta key release after being pressed
781 * 787 *