Diffstat (limited to 'libopie2/opiecore/device/odevice_zaurus.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 2b2467c..33d5cd6 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -20,37 +20,37 @@ | |||
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_zaurus.h" | 30 | #include "odevice_zaurus.h" |
31 | 31 | ||
32 | /* QT */ | ||
33 | #include <qapplication.h> | ||
34 | #include <qfile.h> | ||
35 | #include <qtextstream.h> | ||
36 | #include <qwindowsystem_qws.h> | ||
37 | |||
38 | /* OPIE */ | 32 | /* OPIE */ |
39 | #include <opie2/oinputsystem.h> | 33 | #include <opie2/oinputsystem.h> |
40 | #include <opie2/oresource.h> | 34 | #include <opie2/oresource.h> |
41 | 35 | ||
42 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
43 | #include <qpe/sound.h> | 37 | #include <qpe/sound.h> |
44 | #include <qpe/qcopenvelope_qws.h> | 38 | |
39 | /* QT */ | ||
40 | #include <qapplication.h> | ||
41 | #include <qfile.h> | ||
42 | #include <qtextstream.h> | ||
43 | #include <qwindowsystem_qws.h> | ||
44 | #include <qcopchannel_qws.h> | ||
45 | 45 | ||
46 | /* STD */ | 46 | /* STD */ |
47 | #include <fcntl.h> | 47 | #include <fcntl.h> |
48 | #include <math.h> | 48 | #include <math.h> |
49 | #include <stdlib.h> | 49 | #include <stdlib.h> |
50 | #include <signal.h> | 50 | #include <signal.h> |
51 | #include <sys/ioctl.h> | 51 | #include <sys/ioctl.h> |
52 | #include <sys/time.h> | 52 | #include <sys/time.h> |
53 | #include <unistd.h> | 53 | #include <unistd.h> |
54 | #ifndef QT_NO_SOUND | 54 | #ifndef QT_NO_SOUND |
55 | #include <linux/soundcard.h> | 55 | #include <linux/soundcard.h> |
56 | #endif | 56 | #endif |
@@ -703,42 +703,36 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, | |||
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 | QCopChannel::send( "QPE/System", "aboutToSuspend()" ); |
716 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | ||
717 | } | ||
718 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
719 | 716 | ||
720 | struct timeval tvs, tvn; | 717 | struct timeval tvs, tvn; |
721 | ::gettimeofday ( &tvs, 0 ); | 718 | ::gettimeofday ( &tvs, 0 ); |
722 | 719 | ||
723 | ::sync(); // flush fs caches | 720 | ::sync(); // flush fs caches |
724 | res = ( ::system ( "apm --suspend" ) == 0 ); | 721 | res = ( ::system ( "apm --suspend" ) == 0 ); |
725 | 722 | ||
726 | // This is needed because some apm implementations are asynchronous and we | 723 | // This is needed because some apm implementations are asynchronous and we |
727 | // can not be sure when exactly the device is really suspended | 724 | // can not be sure when exactly the device is really suspended |
728 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | 725 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. |
729 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. | 726 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. |
730 | 727 | ||
731 | if ( res && m_embedix) { | 728 | if ( res && m_embedix) { |
732 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 729 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
733 | ::usleep ( 200 * 1000 ); | 730 | ::usleep ( 200 * 1000 ); |
734 | ::gettimeofday ( &tvn, 0 ); | 731 | ::gettimeofday ( &tvn, 0 ); |
735 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); | 732 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); |
736 | } | 733 | } |
737 | 734 | ||
738 | { | 735 | QCopChannel::send( "QPE/System", "returnFromSuspend()" ); |
739 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | ||
740 | } | ||
741 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
742 | 736 | ||
743 | return res; | 737 | return res; |
744 | } | 738 | } |