summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
committer mickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
commitf0bb6c410f19d502cf563254d95158617a32b94e (patch) (side-by-side diff)
tree63f9953ae1a310f8c286ea62b449e16e6e9d74ce
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 (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
@@ -42,70 +42,74 @@
namespace Opie {
namespace Core {
OAbstractMobileDevice::OAbstractMobileDevice()
: m_timeOut( 1500 )
{}
/**
* @short Time to wait for the asynchronos APM implementation to suspend
*
* Milli Seconds to wait before returning from the suspend method.
* This is needed due asynchrnonus implementations of the APM bios.
*
*/
void OAbstractMobileDevice::setAPMTimeOut( int time ) {
m_timeOut = time;
}
bool OAbstractMobileDevice::suspend() {
if ( !isQWS( ) ) // only qwsserver is allowed to suspend
return false;
bool res = false;
- QCopEnvelope( "QPE/System", "aboutToSuspend()" );
+ {
+ QCopEnvelope( "QPE/System", "aboutToSuspend()" );
+ }
struct timeval tvs, tvn;
::gettimeofday ( &tvs, 0 );
::sync(); // flush fs caches
res = ( ::system ( "apm --suspend" ) == 0 );
// This is needed because some apm implementations are asynchronous and we
// can not be sure when exactly the device is really suspended
// This can be deleted as soon as a stable familiar with a synchronous apm implementation exists.
if ( res ) {
do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
::usleep ( 200 * 1000 );
::gettimeofday ( &tvn, 0 );
} while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
}
- return res;
+ {
+ QCopEnvelope( "QPE/System", "returnFromSuspend()" );
+ }
- QCopEnvelope( "QPE/System", "returnFromSuspend()" );
+ return res;
}
//#include <linux/fb.h> better not rely on kernel headers in userspace ...
// _IO and friends are only defined in kernel headers ...
#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
#define OD_IO(type,number) OD_IOC(0,type,number,0)
#define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611
/* VESA Blanking Levels */
#define VESA_NO_BLANKING 0
#define VESA_VSYNC_SUSPEND 1
#define VESA_HSYNC_SUSPEND 2
#define VESA_POWERDOWN 3
bool OAbstractMobileDevice::setDisplayStatus ( bool on ) {
bool res = false;
int fd;
#ifdef QT_QWS_DEVFS
if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) {
#else
if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) {
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
@@ -691,48 +691,52 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress,
case Key_Up :
case Key_Down :
{
if (rotation()==Rot90) {
newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
}
}
break;
}
if (newkeycode!=keycode) {
if ( newkeycode != Key_unknown ) {
QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
}
return true;
}
return false;
}
bool Zaurus::suspend() {
if ( !isQWS( ) ) // only qwsserver is allowed to suspend
return false;
bool res = false;
- QCopEnvelope( "QPE/System", "aboutToSuspend()" );
+ {
+ QCopEnvelope( "QPE/System", "aboutToSuspend()" );
+ }
struct timeval tvs, tvn;
::gettimeofday ( &tvs, 0 );
::sync(); // flush fs caches
res = ( ::system ( "apm --suspend" ) == 0 );
// This is needed because some apm implementations are asynchronous and we
// can not be sure when exactly the device is really suspended
// This can be deleted as soon as a stable familiar with a synchronous apm implementation exists.
// on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here.
if ( res && m_embedix) {
do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
::usleep ( 200 * 1000 );
::gettimeofday ( &tvn, 0 );
} while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
}
- QCopEnvelope( "QPE/System", "returnFromSuspend()" );
+ {
+ QCopEnvelope( "QPE/System", "returnFromSuspend()" );
+ }
return res;
}