author | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
commit | dd410f1eb69e68f04cf26b6d3e6bca88f0987f71 (patch) (unidiff) | |
tree | 0f2b59bae4c326011783e9cdea0754e180ae0e27 | |
parent | 78e658cecc7521cf3932f5eb44d3f551d73f3181 (diff) | |
download | opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.zip opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.gz opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.bz2 |
remove setSoftSuspend() from ODevice. this is a left-over from the old days
-rw-r--r-- | core/launcher/main.cpp | 7 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 7 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 5 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_genuineintel.cpp | 6 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_genuineintel.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 21 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 44 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.h | 2 |
10 files changed, 3 insertions, 95 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 734d072..5bbed59 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -155,15 +155,12 @@ int initApplication( int argc, char ** argv ) | |||
155 | if ( firstUse() ) | 155 | if ( firstUse() ) |
156 | { | 156 | { |
157 | a.restart(); | 157 | a.restart(); |
158 | return 0; | 158 | return 0; |
159 | } | 159 | } |
160 | 160 | ||
161 | #ifndef Q_OS_MACX | ||
162 | ODevice::inst()->setSoftSuspend( true ); | ||
163 | #endif | ||
164 | { | 161 | { |
165 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | 162 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); |
166 | e << -3; // Forced on | 163 | e << -3; // Forced on |
167 | } | 164 | } |
168 | 165 | ||
169 | AlarmServer::initialize(); | 166 | AlarmServer::initialize(); |
@@ -192,16 +189,12 @@ int initApplication( int argc, char ** argv ) | |||
192 | int rv = a.exec(); | 189 | int rv = a.exec(); |
193 | odebug << "<-- mainloop out" << oendl; | 190 | odebug << "<-- mainloop out" << oendl; |
194 | remove_pidfile(); | 191 | remove_pidfile(); |
195 | odebug << "removing server object..." << oendl; | 192 | odebug << "removing server object..." << oendl; |
196 | delete s; | 193 | delete s; |
197 | 194 | ||
198 | #ifndef Q_OS_MACX | ||
199 | ODevice::inst()->setSoftSuspend( false ); | ||
200 | #endif | ||
201 | |||
202 | odebug << "returning from qpe/initapplication..." << oendl; | 195 | odebug << "returning from qpe/initapplication..." << oendl; |
203 | return rv; | 196 | return rv; |
204 | } | 197 | } |
205 | 198 | ||
206 | static const char *pidfile_path = "/var/run/opie.pid"; | 199 | static const char *pidfile_path = "/var/run/opie.pid"; |
207 | 200 | ||
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 0699d0a..2de0180 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -189,14 +189,13 @@ int main ( int argc, char **argv ) | |||
189 | autolog = ::strdup ( user. latin1 ( )); | 189 | autolog = ::strdup ( user. latin1 ( )); |
190 | } | 190 | } |
191 | 191 | ||
192 | if ( autolog && !userExited ) { | 192 | if ( autolog && !userExited ) { |
193 | 193 | ||
194 | QWSServer::setDesktopBackground( QImage() ); | 194 | QWSServer::setDesktopBackground( QImage() ); |
195 | ODevice::inst ( )-> setDisplayStatus ( true ); | 195 | ODevice::inst()->setDisplayStatus( true ); |
196 | ODevice::inst ( )-> setSoftSuspend ( false ); | ||
197 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); | 196 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); |
198 | LoginApplication::setLoginAs ( autolog ); | 197 | LoginApplication::setLoginAs ( autolog ); |
199 | 198 | ||
200 | 199 | ||
201 | if ( LoginApplication::changeIdentity ( )) | 200 | if ( LoginApplication::changeIdentity ( )) |
202 | ::exit ( LoginApplication::login ( )); | 201 | ::exit ( LoginApplication::login ( )); |
@@ -332,14 +331,12 @@ int login_main ( int argc, char **argv, pid_t ppid ) | |||
332 | 331 | ||
333 | Opie::force_appearance = 0; | 332 | Opie::force_appearance = 0; |
334 | 333 | ||
335 | app-> setFont ( QFont ( "Helvetica", 10 )); | 334 | app-> setFont ( QFont ( "Helvetica", 10 )); |
336 | app-> setStyle ( new QPEStyle ( )); | 335 | app-> setStyle ( new QPEStyle ( )); |
337 | 336 | ||
338 | ODevice::inst ( )-> setSoftSuspend ( true ); | ||
339 | |||
340 | if ( QWSServer::mouseHandler() && | 337 | if ( QWSServer::mouseHandler() && |
341 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 338 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
342 | if ( !QFile::exists ( "/etc/pointercal" )) { | 339 | if ( !QFile::exists ( "/etc/pointercal" )) { |
343 | // Make sure calibration widget starts on top. | 340 | // Make sure calibration widget starts on top. |
344 | Calibrate *cal = new Calibrate; | 341 | Calibrate *cal = new Calibrate; |
345 | cal-> exec ( ); | 342 | cal-> exec ( ); |
@@ -358,14 +355,12 @@ int login_main ( int argc, char **argv, pid_t ppid ) | |||
358 | app-> setMainWidget ( lw ); | 355 | app-> setMainWidget ( lw ); |
359 | lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); | 356 | lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); |
360 | lw-> show ( ); | 357 | lw-> show ( ); |
361 | 358 | ||
362 | int rc = app-> exec ( ); | 359 | int rc = app-> exec ( ); |
363 | 360 | ||
364 | ODevice::inst ( )-> setSoftSuspend ( false ); | ||
365 | |||
366 | if ( app-> loginAs ( )) { | 361 | if ( app-> loginAs ( )) { |
367 | if ( app-> changeIdentity ( )) { | 362 | if ( app-> changeIdentity ( )) { |
368 | app-> login ( ); | 363 | app-> login ( ); |
369 | 364 | ||
370 | // if login succeeds, it never comes back | 365 | // if login succeeds, it never comes back |
371 | 366 | ||
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index a824392..3d69614 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -251,17 +251,12 @@ ODevice::~ODevice() | |||
251 | // we leak m_devicebuttons and m_cpu_frequency | 251 | // we leak m_devicebuttons and m_cpu_frequency |
252 | // but it's a singleton and it is not so importantant | 252 | // but it's a singleton and it is not so importantant |
253 | // -zecke | 253 | // -zecke |
254 | delete d; | 254 | delete d; |
255 | } | 255 | } |
256 | 256 | ||
257 | bool ODevice::setSoftSuspend ( bool /*soft*/ ) | ||
258 | { | ||
259 | return false; | ||
260 | } | ||
261 | |||
262 | //#include <linux/apm_bios.h> | 257 | //#include <linux/apm_bios.h> |
263 | 258 | ||
264 | #define APM_IOC_SUSPEND OD_IO( 'A', 2 ) | 259 | #define APM_IOC_SUSPEND OD_IO( 'A', 2 ) |
265 | 260 | ||
266 | /** | 261 | /** |
267 | * This method will try to suspend the device | 262 | * This method will try to suspend the device |
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index bbc32fa..96a41fc 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h | |||
@@ -252,14 +252,12 @@ public: | |||
252 | QString systemVersionString() const; | 252 | QString systemVersionString() const; |
253 | 253 | ||
254 | virtual Transformation rotation() const; | 254 | virtual Transformation rotation() const; |
255 | virtual ODirection direction() const; | 255 | virtual ODirection direction() const; |
256 | 256 | ||
257 | // system | 257 | // system |
258 | |||
259 | virtual bool setSoftSuspend ( bool on ); | ||
260 | virtual bool suspend(); | 258 | virtual bool suspend(); |
261 | 259 | ||
262 | virtual bool setDisplayStatus ( bool on ); | 260 | virtual bool setDisplayStatus ( bool on ); |
263 | virtual bool setDisplayBrightness ( int brightness ); | 261 | virtual bool setDisplayBrightness ( int brightness ); |
264 | virtual int displayBrightnessResolution() const; | 262 | virtual int displayBrightnessResolution() const; |
265 | virtual bool setDisplayContrast ( int contrast ); | 263 | virtual bool setDisplayContrast ( int contrast ); |
diff --git a/libopie2/opiecore/device/odevice_genuineintel.cpp b/libopie2/opiecore/device/odevice_genuineintel.cpp index 61ba052..1584249 100644 --- a/libopie2/opiecore/device/odevice_genuineintel.cpp +++ b/libopie2/opiecore/device/odevice_genuineintel.cpp | |||
@@ -157,18 +157,12 @@ void GenuineIntel::playAlarmSound() | |||
157 | changeMixerForAlarm(0, "/dev/sound/mixer", &snd ); | 157 | changeMixerForAlarm(0, "/dev/sound/mixer", &snd ); |
158 | snd. play(); | 158 | snd. play(); |
159 | #endif | 159 | #endif |
160 | } | 160 | } |
161 | 161 | ||
162 | 162 | ||
163 | bool GenuineIntel::setSoftSuspend ( bool ) | ||
164 | { | ||
165 | return false; | ||
166 | } | ||
167 | |||
168 | |||
169 | bool GenuineIntel::setDisplayBrightness ( int ) | 163 | bool GenuineIntel::setDisplayBrightness ( int ) |
170 | { | 164 | { |
171 | return false; | 165 | return false; |
172 | } | 166 | } |
173 | 167 | ||
174 | int GenuineIntel::displayBrightnessResolution() const | 168 | int GenuineIntel::displayBrightnessResolution() const |
diff --git a/libopie2/opiecore/device/odevice_genuineintel.h b/libopie2/opiecore/device/odevice_genuineintel.h index 52c5fc6..69316af 100644 --- a/libopie2/opiecore/device/odevice_genuineintel.h +++ b/libopie2/opiecore/device/odevice_genuineintel.h | |||
@@ -44,14 +44,12 @@ class GenuineIntel : public ODevice, public QWSServer::KeyboardFilter | |||
44 | 44 | ||
45 | protected: | 45 | protected: |
46 | virtual void init(const QString&); | 46 | virtual void init(const QString&); |
47 | virtual void initButtons(); | 47 | virtual void initButtons(); |
48 | 48 | ||
49 | public: | 49 | public: |
50 | virtual bool setSoftSuspend( bool soft ); | ||
51 | |||
52 | virtual bool setDisplayBrightness( int b ); | 50 | virtual bool setDisplayBrightness( int b ); |
53 | virtual int displayBrightnessResolution() const; | 51 | virtual int displayBrightnessResolution() const; |
54 | 52 | ||
55 | virtual void playAlarmSound(); | 53 | virtual void playAlarmSound(); |
56 | 54 | ||
57 | virtual QValueList <OLed> ledList() const; | 55 | virtual QValueList <OLed> ledList() const; |
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 9e01a0c..2ce38a9 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp | |||
@@ -333,33 +333,12 @@ void iPAQ::playAlarmSound() | |||
333 | 333 | ||
334 | changeMixerForAlarm(0, "/dev/sound/mixer", &snd ); | 334 | changeMixerForAlarm(0, "/dev/sound/mixer", &snd ); |
335 | snd. play(); | 335 | snd. play(); |
336 | #endif | 336 | #endif |
337 | } | 337 | } |
338 | 338 | ||
339 | |||
340 | bool iPAQ::setSoftSuspend ( bool soft ) | ||
341 | { | ||
342 | bool res = false; | ||
343 | int fd; | ||
344 | |||
345 | if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) { | ||
346 | if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 ) | ||
347 | res = true; | ||
348 | else | ||
349 | ::perror ( "write to /proc/sys/ts/suspend_button_mode" ); | ||
350 | |||
351 | ::close ( fd ); | ||
352 | } | ||
353 | else | ||
354 | ::perror ( "/proc/sys/ts/suspend_button_mode" ); | ||
355 | |||
356 | return res; | ||
357 | } | ||
358 | |||
359 | |||
360 | bool iPAQ::setDisplayBrightness ( int bright ) | 339 | bool iPAQ::setDisplayBrightness ( int bright ) |
361 | { | 340 | { |
362 | bool res = false; | 341 | bool res = false; |
363 | int fd; | 342 | int fd; |
364 | 343 | ||
365 | if ( bright > 255 ) | 344 | if ( bright > 255 ) |
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h index cc0b8ac..b1dac74 100644 --- a/libopie2/opiecore/device/odevice_ipaq.h +++ b/libopie2/opiecore/device/odevice_ipaq.h | |||
@@ -44,14 +44,12 @@ class iPAQ : public ODevice, public QWSServer::KeyboardFilter | |||
44 | 44 | ||
45 | protected: | 45 | protected: |
46 | virtual void init(const QString&); | 46 | virtual void init(const QString&); |
47 | virtual void initButtons(); | 47 | virtual void initButtons(); |
48 | 48 | ||
49 | public: | 49 | public: |
50 | virtual bool setSoftSuspend( bool soft ); | ||
51 | |||
52 | virtual bool setDisplayBrightness( int b ); | 50 | virtual bool setDisplayBrightness( int b ); |
53 | virtual int displayBrightnessResolution() const; | 51 | virtual int displayBrightnessResolution() const; |
54 | 52 | ||
55 | virtual void playAlarmSound(); | 53 | virtual void playAlarmSound(); |
56 | 54 | ||
57 | virtual QValueList <OLed> ledList() const; | 55 | virtual QValueList <OLed> ledList() const; |
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index b22ee70..cbc7a24 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -377,49 +377,12 @@ bool Zaurus::setLedState( OLed which, OLedState st ) | |||
377 | } | 377 | } |
378 | } | 378 | } |
379 | } | 379 | } |
380 | return false; | 380 | return false; |
381 | } | 381 | } |
382 | 382 | ||
383 | bool Zaurus::setSoftSuspend ( bool soft ) | ||
384 | { | ||
385 | if (!m_embedix) { | ||
386 | /* non-Embedix kernels dont have kernel autosuspend */ | ||
387 | return ODevice::setSoftSuspend( soft ); | ||
388 | } | ||
389 | |||
390 | bool res = false; | ||
391 | int fd; | ||
392 | |||
393 | if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) || | ||
394 | (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) { | ||
395 | |||
396 | int sources = ::ioctl( fd, APM_IOCGEVTSRC, 0 ); // get current event sources | ||
397 | |||
398 | if ( sources >= 0 ) { | ||
399 | if ( soft ) | ||
400 | sources &= ~APM_EVT_POWER_BUTTON; | ||
401 | else | ||
402 | sources |= APM_EVT_POWER_BUTTON; | ||
403 | |||
404 | if ( ::ioctl( fd, APM_IOCSEVTSRC, sources ) >= 0 ) // set new event sources | ||
405 | res = true; | ||
406 | else | ||
407 | perror ( "APM_IOCGEVTSRC" ); | ||
408 | } | ||
409 | else | ||
410 | perror ( "APM_IOCGEVTSRC" ); | ||
411 | |||
412 | ::close( fd ); | ||
413 | } | ||
414 | else | ||
415 | perror( "/dev/apm_bios or /dev/misc/apm_bios" ); | ||
416 | |||
417 | return res; | ||
418 | } | ||
419 | |||
420 | int Zaurus::displayBrightnessResolution() const | 383 | int Zaurus::displayBrightnessResolution() const |
421 | { | 384 | { |
422 | int res = 1; | 385 | int res = 1; |
423 | if (m_embedix) | 386 | if (m_embedix) |
424 | { | 387 | { |
425 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_RDWR|O_NONBLOCK ); | 388 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_RDWR|O_NONBLOCK ); |
@@ -537,15 +500,13 @@ bool Zaurus::suspend() | |||
537 | } | 500 | } |
538 | 501 | ||
539 | 502 | ||
540 | Transformation Zaurus::rotation() const | 503 | Transformation Zaurus::rotation() const |
541 | { | 504 | { |
542 | Transformation rot; | 505 | Transformation rot; |
543 | int handle = 0; | 506 | |
544 | int retval = 0; | ||
545 | |||
546 | switch ( d->m_model ) { | 507 | switch ( d->m_model ) { |
547 | case Model_Zaurus_SLC3000: // fallthrough | 508 | case Model_Zaurus_SLC3000: // fallthrough |
548 | case Model_Zaurus_SLC7x0: | 509 | case Model_Zaurus_SLC7x0: |
549 | OHingeStatus hs = readHingeSensor(); | 510 | OHingeStatus hs = readHingeSensor(); |
550 | if ( hs == CASE_PORTRAIT ) rot = Rot0; | 511 | if ( hs == CASE_PORTRAIT ) rot = Rot0; |
551 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; | 512 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; |
@@ -563,14 +524,13 @@ Transformation Zaurus::rotation() const | |||
563 | 524 | ||
564 | return rot; | 525 | return rot; |
565 | } | 526 | } |
566 | ODirection Zaurus::direction() const | 527 | ODirection Zaurus::direction() const |
567 | { | 528 | { |
568 | ODirection dir; | 529 | ODirection dir; |
569 | int handle = 0; | 530 | |
570 | int retval = 0; | ||
571 | switch ( d->m_model ) { | 531 | switch ( d->m_model ) { |
572 | case Model_Zaurus_SLC3000: // fallthrough | 532 | case Model_Zaurus_SLC3000: // fallthrough |
573 | case Model_Zaurus_SLC7x0: | 533 | case Model_Zaurus_SLC7x0: |
574 | OHingeStatus hs = readHingeSensor(); | 534 | OHingeStatus hs = readHingeSensor(); |
575 | if ( hs == CASE_PORTRAIT ) dir = CCW; | 535 | if ( hs == CASE_PORTRAIT ) dir = CCW; |
576 | else if ( hs == CASE_UNKNOWN ) dir = CCW; | 536 | else if ( hs == CASE_UNKNOWN ) dir = CCW; |
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h index c763798..04e73c4 100644 --- a/libopie2/opiecore/device/odevice_zaurus.h +++ b/libopie2/opiecore/device/odevice_zaurus.h | |||
@@ -91,14 +91,12 @@ class Zaurus : public ODevice | |||
91 | { | 91 | { |
92 | protected: | 92 | protected: |
93 | virtual void init(const QString&); | 93 | virtual void init(const QString&); |
94 | virtual void initButtons(); | 94 | virtual void initButtons(); |
95 | 95 | ||
96 | public: | 96 | public: |
97 | virtual bool setSoftSuspend( bool soft ); | ||
98 | |||
99 | virtual bool setDisplayBrightness( int b ); | 97 | virtual bool setDisplayBrightness( int b ); |
100 | virtual bool setDisplayStatus( bool on ); | 98 | virtual bool setDisplayStatus( bool on ); |
101 | virtual int displayBrightnessResolution() const; | 99 | virtual int displayBrightnessResolution() const; |
102 | 100 | ||
103 | virtual void playAlarmSound(); | 101 | virtual void playAlarmSound(); |
104 | virtual void playKeySound(); | 102 | virtual void playKeySound(); |