summaryrefslogtreecommitdiff
path: root/libopie2
authormickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
committer mickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
commitf0bb6c410f19d502cf563254d95158617a32b94e (patch) (unidiff)
tree63f9953ae1a310f8c286ea62b449e16e6e9d74ce /libopie2
parentc1fc89afc42b1a8781b92b581f5be19916e2b69d (diff)
downloadopie-f0bb6c410f19d502cf563254d95158617a32b94e.zip
opie-f0bb6c410f19d502cf563254d95158617a32b94e.tar.gz
opie-f0bb6c410f19d502cf563254d95158617a32b94e.tar.bz2
fix STUPID bug by remembering that a QCopEnvelope is sent in the object destructor
sometimes C++ is too tricky for human beings :/
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_abstractmobiledevice.cpp10
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp8
2 files changed, 13 insertions, 5 deletions
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
index fe5864b..dbe9364 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -18,103 +18,107 @@
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
42namespace Opie { 42namespace Opie {
43namespace Core { 43namespace Core {
44OAbstractMobileDevice::OAbstractMobileDevice() 44OAbstractMobileDevice::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 */
55void OAbstractMobileDevice::setAPMTimeOut( int time ) { 55void OAbstractMobileDevice::setAPMTimeOut( int time ) {
56 m_timeOut = time; 56 m_timeOut = time;
57} 57}
58 58
59 59
60bool OAbstractMobileDevice::suspend() { 60bool 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 QCopEnvelope( "QPE/System", "aboutToSuspend()" ); 66 {
67 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
68 }
67 69
68 struct timeval tvs, tvn; 70 struct timeval tvs, tvn;
69 ::gettimeofday ( &tvs, 0 ); 71 ::gettimeofday ( &tvs, 0 );
70 72
71 ::sync(); // flush fs caches 73 ::sync(); // flush fs caches
72 res = ( ::system ( "apm --suspend" ) == 0 ); 74 res = ( ::system ( "apm --suspend" ) == 0 );
73 75
74 // This is needed because some apm implementations are asynchronous and we 76 // This is needed because some apm implementations are asynchronous and we
75 // can not be sure when exactly the device is really suspended 77 // can not be sure when exactly the device is really suspended
76 // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. 78 // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists.
77 79
78 if ( res ) { 80 if ( res ) {
79 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed 81 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
80 ::usleep ( 200 * 1000 ); 82 ::usleep ( 200 * 1000 );
81 ::gettimeofday ( &tvn, 0 ); 83 ::gettimeofday ( &tvn, 0 );
82 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 84 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
83 } 85 }
84 86
85 return res; 87 {
88 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
89 }
86 90
87 QCopEnvelope( "QPE/System", "returnFromSuspend()" ); 91 return res;
88} 92}
89 93
90//#include <linux/fb.h> better not rely on kernel headers in userspace ... 94//#include <linux/fb.h> better not rely on kernel headers in userspace ...
91 95
92// _IO and friends are only defined in kernel headers ... 96// _IO and friends are only defined in kernel headers ...
93#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) 97#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
94#define OD_IO(type,number) OD_IOC(0,type,number,0) 98#define OD_IO(type,number) OD_IOC(0,type,number,0)
95 99
96#define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 100#define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611
97 101
98/* VESA Blanking Levels */ 102/* VESA Blanking Levels */
99#define VESA_NO_BLANKING 0 103#define VESA_NO_BLANKING 0
100#define VESA_VSYNC_SUSPEND 1 104#define VESA_VSYNC_SUSPEND 1
101#define VESA_HSYNC_SUSPEND 2 105#define VESA_HSYNC_SUSPEND 2
102#define VESA_POWERDOWN 3 106#define VESA_POWERDOWN 3
103 107
104bool OAbstractMobileDevice::setDisplayStatus ( bool on ) { 108bool OAbstractMobileDevice::setDisplayStatus ( bool on ) {
105 bool res = false; 109 bool res = false;
106 int fd; 110 int fd;
107 111
108#ifdef QT_QWS_DEVFS 112#ifdef QT_QWS_DEVFS
109 if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) { 113 if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) {
110#else 114#else
111 if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) { 115 if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) {
112#endif 116#endif
113 res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 ); 117 res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 );
114 ::close ( fd ); 118 ::close ( fd );
115 } 119 }
116 120
117 return res; 121 return res;
118} 122}
119} 123}
120} 124}
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 */
680bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) 680bool 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
710bool Zaurus::suspend() { 710bool 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}