summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-27 22:40:41 (UTC)
committer mickeyl <mickeyl>2005-08-27 22:40:41 (UTC)
commit43217700cc9b23519776a27661fbf0c29a7d100d (patch) (unidiff)
tree566f54414b7148c519bf3781f723a269b33c32e1
parent85bddcabafcf7a0529e3738f306d63988b7dcbbc (diff)
downloadopie-43217700cc9b23519776a27661fbf0c29a7d100d.zip
opie-43217700cc9b23519776a27661fbf0c29a7d100d.tar.gz
opie-43217700cc9b23519776a27661fbf0c29a7d100d.tar.bz2
call QCopChannel::send() instead of using a QCopEnvelop
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_abstractmobiledevice.cpp16
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp24
2 files changed, 14 insertions, 26 deletions
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
index b446d05..7ee72ba 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -8,108 +8,102 @@
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/* QT */
33#include <qcopchannel_qws.h>
33 34
35/* STD */
34#include <sys/time.h> 36#include <sys/time.h>
35#include <sys/ioctl.h> 37#include <sys/ioctl.h>
36
37#include <time.h> 38#include <time.h>
38#include <fcntl.h> 39#include <fcntl.h>
39#include <unistd.h> 40#include <unistd.h>
40#include <stdlib.h> 41#include <stdlib.h>
41 42
42namespace Opie { 43namespace Opie {
43namespace Core { 44namespace Core {
44OAbstractMobileDevice::OAbstractMobileDevice() 45OAbstractMobileDevice::OAbstractMobileDevice()
45 : m_timeOut( 1500 ) 46 : m_timeOut( 1500 )
46{} 47{}
47 48
48/** 49/**
49 * @short Time to wait for the asynchronos APM implementation to suspend 50 * @short Time to wait for the asynchronos APM implementation to suspend
50 * 51 *
51 * Milli Seconds to wait before returning from the suspend method. 52 * Milli Seconds to wait before returning from the suspend method.
52 * This is needed due asynchrnonus implementations of the APM bios. 53 * This is needed due asynchrnonus implementations of the APM bios.
53 * 54 *
54 */ 55 */
55void OAbstractMobileDevice::setAPMTimeOut( int time ) { 56void OAbstractMobileDevice::setAPMTimeOut( int time ) {
56 m_timeOut = time; 57 m_timeOut = time;
57} 58}
58 59
59 60
60bool OAbstractMobileDevice::suspend() { 61bool OAbstractMobileDevice::suspend() {
61 if ( !isQWS( ) ) // only qwsserver is allowed to suspend 62 if ( !isQWS( ) ) // only qwsserver is allowed to suspend
62 return false; 63 return false;
63 64
64 bool res = false; 65 bool res = false;
65 66 QCopChannel::send( "QPE/System", "aboutToSuspend()" );
66 {
67 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
68 }
69 qApp->processEvents(); // ensure the qcop call is being processed asap
70 67
71 struct timeval tvs, tvn; 68 struct timeval tvs, tvn;
72 ::gettimeofday ( &tvs, 0 ); 69 ::gettimeofday ( &tvs, 0 );
73 70
74 ::sync(); // flush fs caches 71 ::sync(); // flush fs caches
75 res = ( ::system ( "apm --suspend" ) == 0 ); 72 res = ( ::system ( "apm --suspend" ) == 0 );
76 73
77 // This is needed because some apm implementations are asynchronous and we 74 // This is needed because some apm implementations are asynchronous and we
78 // can not be sure when exactly the device is really suspended 75 // can not be sure when exactly the device is really suspended
79 // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. 76 // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists.
80 77
81 if ( res ) { 78 if ( res ) {
82 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed 79 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
83 ::usleep ( 200 * 1000 ); 80 ::usleep ( 200 * 1000 );
84 ::gettimeofday ( &tvn, 0 ); 81 ::gettimeofday ( &tvn, 0 );
85 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 82 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
86 } 83 }
87 84
88 { 85 QCopChannel::send( "QPE/System", "returnFromSuspend()" );
89 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
90 }
91 qApp->processEvents(); // ensure the qcop call is being processed asap
92 86
93 return res; 87 return res;
94} 88}
95 89
96//#include <linux/fb.h> better not rely on kernel headers in userspace ... 90//#include <linux/fb.h> better not rely on kernel headers in userspace ...
97 91
98// _IO and friends are only defined in kernel headers ... 92// _IO and friends are only defined in kernel headers ...
99#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) 93#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
100#define OD_IO(type,number) OD_IOC(0,type,number,0) 94#define OD_IO(type,number) OD_IOC(0,type,number,0)
101 95
102#define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 96#define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611
103 97
104/* VESA Blanking Levels */ 98/* VESA Blanking Levels */
105#define VESA_NO_BLANKING 0 99#define VESA_NO_BLANKING 0
106#define VESA_VSYNC_SUSPEND 1 100#define VESA_VSYNC_SUSPEND 1
107#define VESA_HSYNC_SUSPEND 2 101#define VESA_HSYNC_SUSPEND 2
108#define VESA_POWERDOWN 3 102#define VESA_POWERDOWN 3
109 103
110bool OAbstractMobileDevice::setDisplayStatus ( bool on ) { 104bool OAbstractMobileDevice::setDisplayStatus ( bool on ) {
111 bool res = false; 105 bool res = false;
112 int fd; 106 int fd;
113 107
114#ifdef QT_QWS_DEVFS 108#ifdef QT_QWS_DEVFS
115 if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) { 109 if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) {
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
@@ -8,61 +8,61 @@
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_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
57 57
58using namespace Opie::Core; 58using namespace Opie::Core;
59using namespace Opie::Core::Internal; 59using namespace Opie::Core::Internal;
60 60
61struct z_button z_buttons [] = { 61struct z_button z_buttons [] = {
62 { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), 62 { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
63 "devicebuttons/z_calendar", 63 "devicebuttons/z_calendar",
64 "datebook", "nextView()", 64 "datebook", "nextView()",
65 "today", "raise()" }, 65 "today", "raise()" },
66 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), 66 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
67 "devicebuttons/z_contact", 67 "devicebuttons/z_contact",
68 "addressbook", "raise()", 68 "addressbook", "raise()",
@@ -691,54 +691,48 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress,
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 { 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}