-rw-r--r-- | libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp index dbe9364..b446d05 100644 --- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp +++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | |||
@@ -1,124 +1,126 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org> | 3 | Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org> |
4 | =. Copyright (C) 2004, 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> | 4 | =. Copyright (C) 2004, 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> |
5 | .=l. Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org> | 5 | .=l. Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org> |
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; version 2 of the License. | 11 | - . .-<_> .<> Foundation; version 2 of the License. |
12 | ._= =} : | 12 | ._= =} : |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "odevice_abstractmobiledevice.h" | 30 | #include "odevice_abstractmobiledevice.h" |
31 | 31 | ||
32 | #include <qpe/qcopenvelope_qws.h> | 32 | #include <qpe/qcopenvelope_qws.h> |
33 | 33 | ||
34 | #include <sys/time.h> | 34 | #include <sys/time.h> |
35 | #include <sys/ioctl.h> | 35 | #include <sys/ioctl.h> |
36 | 36 | ||
37 | #include <time.h> | 37 | #include <time.h> |
38 | #include <fcntl.h> | 38 | #include <fcntl.h> |
39 | #include <unistd.h> | 39 | #include <unistd.h> |
40 | #include <stdlib.h> | 40 | #include <stdlib.h> |
41 | 41 | ||
42 | namespace Opie { | 42 | namespace Opie { |
43 | namespace Core { | 43 | namespace Core { |
44 | OAbstractMobileDevice::OAbstractMobileDevice() | 44 | OAbstractMobileDevice::OAbstractMobileDevice() |
45 | : m_timeOut( 1500 ) | 45 | : m_timeOut( 1500 ) |
46 | {} | 46 | {} |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * @short Time to wait for the asynchronos APM implementation to suspend | 49 | * @short Time to wait for the asynchronos APM implementation to suspend |
50 | * | 50 | * |
51 | * Milli Seconds to wait before returning from the suspend method. | 51 | * Milli Seconds to wait before returning from the suspend method. |
52 | * This is needed due asynchrnonus implementations of the APM bios. | 52 | * This is needed due asynchrnonus implementations of the APM bios. |
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | void OAbstractMobileDevice::setAPMTimeOut( int time ) { | 55 | void OAbstractMobileDevice::setAPMTimeOut( int time ) { |
56 | m_timeOut = time; | 56 | m_timeOut = time; |
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
60 | bool OAbstractMobileDevice::suspend() { | 60 | bool OAbstractMobileDevice::suspend() { |
61 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 61 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend |
62 | return false; | 62 | return false; |
63 | 63 | ||
64 | bool res = false; | 64 | bool res = false; |
65 | 65 | ||
66 | { | 66 | { |
67 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | 67 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); |
68 | } | 68 | } |
69 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
69 | 70 | ||
70 | struct timeval tvs, tvn; | 71 | struct timeval tvs, tvn; |
71 | ::gettimeofday ( &tvs, 0 ); | 72 | ::gettimeofday ( &tvs, 0 ); |
72 | 73 | ||
73 | ::sync(); // flush fs caches | 74 | ::sync(); // flush fs caches |
74 | res = ( ::system ( "apm --suspend" ) == 0 ); | 75 | res = ( ::system ( "apm --suspend" ) == 0 ); |
75 | 76 | ||
76 | // This is needed because some apm implementations are asynchronous and we | 77 | // This is needed because some apm implementations are asynchronous and we |
77 | // can not be sure when exactly the device is really suspended | 78 | // can not be sure when exactly the device is really suspended |
78 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | 79 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. |
79 | 80 | ||
80 | if ( res ) { | 81 | if ( res ) { |
81 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 82 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
82 | ::usleep ( 200 * 1000 ); | 83 | ::usleep ( 200 * 1000 ); |
83 | ::gettimeofday ( &tvn, 0 ); | 84 | ::gettimeofday ( &tvn, 0 ); |
84 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); | 85 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); |
85 | } | 86 | } |
86 | 87 | ||
87 | { | 88 | { |
88 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | 89 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); |
89 | } | 90 | } |
91 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
90 | 92 | ||
91 | return res; | 93 | return res; |
92 | } | 94 | } |
93 | 95 | ||
94 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... | 96 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... |
95 | 97 | ||
96 | // _IO and friends are only defined in kernel headers ... | 98 | // _IO and friends are only defined in kernel headers ... |
97 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) | 99 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) |
98 | #define OD_IO(type,number) OD_IOC(0,type,number,0) | 100 | #define OD_IO(type,number) OD_IOC(0,type,number,0) |
99 | 101 | ||
100 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 | 102 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 |
101 | 103 | ||
102 | /* VESA Blanking Levels */ | 104 | /* VESA Blanking Levels */ |
103 | #define VESA_NO_BLANKING 0 | 105 | #define VESA_NO_BLANKING 0 |
104 | #define VESA_VSYNC_SUSPEND 1 | 106 | #define VESA_VSYNC_SUSPEND 1 |
105 | #define VESA_HSYNC_SUSPEND 2 | 107 | #define VESA_HSYNC_SUSPEND 2 |
106 | #define VESA_POWERDOWN 3 | 108 | #define VESA_POWERDOWN 3 |
107 | 109 | ||
108 | bool OAbstractMobileDevice::setDisplayStatus ( bool on ) { | 110 | bool OAbstractMobileDevice::setDisplayStatus ( bool on ) { |
109 | bool res = false; | 111 | bool res = false; |
110 | int fd; | 112 | int fd; |
111 | 113 | ||
112 | #ifdef QT_QWS_DEVFS | 114 | #ifdef QT_QWS_DEVFS |
113 | if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) { | 115 | if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) { |
114 | #else | 116 | #else |
115 | if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) { | 117 | if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) { |
116 | #endif | 118 | #endif |
117 | res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 ); | 119 | res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 ); |
118 | ::close ( fd ); | 120 | ::close ( fd ); |
119 | } | 121 | } |
120 | 122 | ||
121 | return res; | 123 | return res; |
122 | } | 124 | } |
123 | } | 125 | } |
124 | } | 126 | } |
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 5d48488..2b2467c 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -622,121 +622,123 @@ ODirection Zaurus::direction() const | |||
622 | default: dir = d->m_direction; | 622 | default: dir = d->m_direction; |
623 | break; | 623 | break; |
624 | } | 624 | } |
625 | return dir; | 625 | return dir; |
626 | 626 | ||
627 | } | 627 | } |
628 | 628 | ||
629 | bool Zaurus::hasHingeSensor() const | 629 | bool Zaurus::hasHingeSensor() const |
630 | { | 630 | { |
631 | return d->m_model == Model_Zaurus_SLC7x0 || | 631 | return d->m_model == Model_Zaurus_SLC7x0 || |
632 | d->m_model == Model_Zaurus_SLC3100 || | 632 | d->m_model == Model_Zaurus_SLC3100 || |
633 | d->m_model == Model_Zaurus_SLC3000 || | 633 | d->m_model == Model_Zaurus_SLC3000 || |
634 | d->m_model == Model_Zaurus_SLC1000; | 634 | d->m_model == Model_Zaurus_SLC1000; |
635 | } | 635 | } |
636 | 636 | ||
637 | OHingeStatus Zaurus::readHingeSensor() const | 637 | OHingeStatus Zaurus::readHingeSensor() const |
638 | { | 638 | { |
639 | if (m_embedix) | 639 | if (m_embedix) |
640 | { | 640 | { |
641 | int handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK); | 641 | int handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK); |
642 | if (handle == -1) | 642 | if (handle == -1) |
643 | { | 643 | { |
644 | qWarning("Zaurus::readHingeSensor() - failed (%s)", "unknown reason" ); //FIXME: use strerror | 644 | qWarning("Zaurus::readHingeSensor() - failed (%s)", "unknown reason" ); //FIXME: use strerror |
645 | return CASE_UNKNOWN; | 645 | return CASE_UNKNOWN; |
646 | } | 646 | } |
647 | else | 647 | else |
648 | { | 648 | { |
649 | int retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION); | 649 | int retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION); |
650 | ::close (handle); | 650 | ::close (handle); |
651 | if ( retval == CASE_CLOSED || retval == CASE_PORTRAIT || retval == CASE_LANDSCAPE ) | 651 | if ( retval == CASE_CLOSED || retval == CASE_PORTRAIT || retval == CASE_LANDSCAPE ) |
652 | { | 652 | { |
653 | qDebug( "Zaurus::readHingeSensor() - result = %d", retval ); | 653 | qDebug( "Zaurus::readHingeSensor() - result = %d", retval ); |
654 | return static_cast<OHingeStatus>( retval ); | 654 | return static_cast<OHingeStatus>( retval ); |
655 | } | 655 | } |
656 | else | 656 | else |
657 | { | 657 | { |
658 | qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" ); | 658 | qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" ); |
659 | return CASE_UNKNOWN; | 659 | return CASE_UNKNOWN; |
660 | } | 660 | } |
661 | } | 661 | } |
662 | } | 662 | } |
663 | else | 663 | else |
664 | { | 664 | { |
665 | // corgi keyboard is event source 0 in OZ kernel 2.6 | 665 | // corgi keyboard is event source 0 in OZ kernel 2.6 |
666 | OInputDevice* keyboard = OInputSystem::instance()->device( "event0" ); | 666 | OInputDevice* keyboard = OInputSystem::instance()->device( "event0" ); |
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 | { | 715 | { |
716 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | 716 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); |
717 | } | 717 | } |
718 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
718 | 719 | ||
719 | struct timeval tvs, tvn; | 720 | struct timeval tvs, tvn; |
720 | ::gettimeofday ( &tvs, 0 ); | 721 | ::gettimeofday ( &tvs, 0 ); |
721 | 722 | ||
722 | ::sync(); // flush fs caches | 723 | ::sync(); // flush fs caches |
723 | res = ( ::system ( "apm --suspend" ) == 0 ); | 724 | res = ( ::system ( "apm --suspend" ) == 0 ); |
724 | 725 | ||
725 | // This is needed because some apm implementations are asynchronous and we | 726 | // This is needed because some apm implementations are asynchronous and we |
726 | // can not be sure when exactly the device is really suspended | 727 | // can not be sure when exactly the device is really suspended |
727 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | 728 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. |
728 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. | 729 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. |
729 | 730 | ||
730 | if ( res && m_embedix) { | 731 | if ( res && m_embedix) { |
731 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 732 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
732 | ::usleep ( 200 * 1000 ); | 733 | ::usleep ( 200 * 1000 ); |
733 | ::gettimeofday ( &tvn, 0 ); | 734 | ::gettimeofday ( &tvn, 0 ); |
734 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); | 735 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); |
735 | } | 736 | } |
736 | 737 | ||
737 | { | 738 | { |
738 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | 739 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); |
739 | } | 740 | } |
741 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
740 | 742 | ||
741 | return res; | 743 | return res; |
742 | } | 744 | } |