summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp10
1 files changed, 8 insertions, 2 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
@@ -355,43 +355,42 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
355 // diaeresis 355 // diaeresis
356 qkeycode = 0x2001; 356 qkeycode = 0x2001;
357 } 357 }
358 else { 358 else {
359 359
360 // circumflex 360 // circumflex
361 qkeycode = 0x2000; 361 qkeycode = 0x2000;
362 } 362 }
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) {
372 372
373 // circumblex 373 // circumblex
374 qkeycode = 0x2000; 374 qkeycode = 0x2000;
375 } 375 }
376 else { 376 else {
377 377
378 // back accent 378 // back accent
379 qkeycode = 0x2002; 379 qkeycode = 0x2002;
380 } 380 }
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) {
390 389
391 // diaeresis 390 // diaeresis
392 qkeycode = 0x2001; 391 qkeycode = 0x2001;
393 } 392 }
394 else { 393 else {
395 394
396 // accent 395 // accent
397 qkeycode = 0x2003; 396 qkeycode = 0x2003;
@@ -766,24 +765,31 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*)
766 *shift = 0; // unpress shift key 765 *shift = 0; // unpress shift key
767 shift = 0; // reset the shift pointer 766 shift = 0; // reset the shift pointer
768 repaint(FALSE); 767 repaint(FALSE);
769 768
770 } 769 }
771 if (ctrl && unicode != 0) { 770 if (ctrl && unicode != 0) {
772 771
773 *ctrl = 0; 772 *ctrl = 0;
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 *
782 788
783 else if (meta && unicode != 0) { 789 else if (meta && unicode != 0) {
784 790
785 *meta = 0; 791 *meta = 0;
786 meta = 0; 792 meta = 0;
787 repaint(FALSE); 793 repaint(FALSE);
788 } 794 }
789 795