Diffstat (limited to 'libopie2/opiecore/device/odevice_zaurus.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 4a80a7e..5d48488 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -667,72 +667,76 @@ OHingeStatus Zaurus::readHingeSensor() const | |||
667 | if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP0 ) ) return CASE_LANDSCAPE; | 667 | if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP0 ) ) return CASE_LANDSCAPE; |
668 | else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP1 ) ) return CASE_PORTRAIT; | 668 | else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP1 ) ) return CASE_PORTRAIT; |
669 | else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP2 ) ) return CASE_CLOSED; | 669 | else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP2 ) ) return CASE_CLOSED; |
670 | qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" ); | 670 | qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" ); |
671 | return CASE_UNKNOWN; | 671 | return CASE_UNKNOWN; |
672 | } | 672 | } |
673 | } | 673 | } |
674 | 674 | ||
675 | /* | 675 | /* |
676 | * Take code from iPAQ device. | 676 | * Take code from iPAQ device. |
677 | * That way we switch the cursor directions depending on status of hinge sensor, eg. hardware direction. | 677 | * That way we switch the cursor directions depending on status of hinge sensor, eg. hardware direction. |
678 | * I hope that is ok - Alwin | 678 | * I hope that is ok - Alwin |
679 | */ | 679 | */ |
680 | bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) | 680 | bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) |
681 | { | 681 | { |
682 | int newkeycode = keycode; | 682 | int newkeycode = keycode; |
683 | 683 | ||
684 | if ( !hasHingeSensor() ) return false; | 684 | if ( !hasHingeSensor() ) return false; |
685 | 685 | ||
686 | /* map cursor keys depending on the hinge status */ | 686 | /* map cursor keys depending on the hinge status */ |
687 | switch ( keycode ) { | 687 | switch ( keycode ) { |
688 | // Rotate cursor keys | 688 | // Rotate cursor keys |
689 | case Key_Left : | 689 | case Key_Left : |
690 | case Key_Right: | 690 | case Key_Right: |
691 | case Key_Up : | 691 | case Key_Up : |
692 | case Key_Down : | 692 | case Key_Down : |
693 | { | 693 | { |
694 | if (rotation()==Rot90) { | 694 | if (rotation()==Rot90) { |
695 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; | 695 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; |
696 | } | 696 | } |
697 | } | 697 | } |
698 | break; | 698 | break; |
699 | 699 | ||
700 | } | 700 | } |
701 | if (newkeycode!=keycode) { | 701 | if (newkeycode!=keycode) { |
702 | if ( newkeycode != Key_unknown ) { | 702 | if ( newkeycode != Key_unknown ) { |
703 | QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); | 703 | QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); |
704 | } | 704 | } |
705 | return true; | 705 | return true; |
706 | } | 706 | } |
707 | return false; | 707 | return false; |
708 | } | 708 | } |
709 | 709 | ||
710 | bool Zaurus::suspend() { | 710 | bool Zaurus::suspend() { |
711 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 711 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend |
712 | return false; | 712 | return false; |
713 | 713 | ||
714 | bool res = false; | 714 | bool res = false; |
715 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | 715 | { |
716 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | ||
717 | } | ||
716 | 718 | ||
717 | struct timeval tvs, tvn; | 719 | struct timeval tvs, tvn; |
718 | ::gettimeofday ( &tvs, 0 ); | 720 | ::gettimeofday ( &tvs, 0 ); |
719 | 721 | ||
720 | ::sync(); // flush fs caches | 722 | ::sync(); // flush fs caches |
721 | res = ( ::system ( "apm --suspend" ) == 0 ); | 723 | res = ( ::system ( "apm --suspend" ) == 0 ); |
722 | 724 | ||
723 | // This is needed because some apm implementations are asynchronous and we | 725 | // This is needed because some apm implementations are asynchronous and we |
724 | // can not be sure when exactly the device is really suspended | 726 | // can not be sure when exactly the device is really suspended |
725 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | 727 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. |
726 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. | 728 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. |
727 | 729 | ||
728 | if ( res && m_embedix) { | 730 | if ( res && m_embedix) { |
729 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 731 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
730 | ::usleep ( 200 * 1000 ); | 732 | ::usleep ( 200 * 1000 ); |
731 | ::gettimeofday ( &tvn, 0 ); | 733 | ::gettimeofday ( &tvn, 0 ); |
732 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); | 734 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); |
733 | } | 735 | } |
734 | 736 | ||
735 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | 737 | { |
738 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | ||
739 | } | ||
736 | 740 | ||
737 | return res; | 741 | return res; |
738 | } | 742 | } |