summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp34
-rw-r--r--library/password.cpp24
-rw-r--r--library/password.h1
3 files changed, 46 insertions, 13 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 0e60839..d74b745 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -172,25 +172,25 @@ public:
172 m_backlight_forcedoff = false; 172 m_backlight_forcedoff = false;
173 173
174 // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) 174 // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
175 ODevice::inst ( ) -> setDisplayStatus ( true ); 175 ODevice::inst ( ) -> setDisplayStatus ( true );
176 } 176 }
177 void restore() 177 void restore()
178 { 178 {
179 if ( !m_lcd_status ) { // We must have turned it off 179 if ( !m_lcd_status ) { // We must have turned it off
180 ODevice::inst ( ) -> setDisplayStatus ( true ); 180 ODevice::inst ( ) -> setDisplayStatus ( true );
181 m_lcd_status = true; 181 m_lcd_status = true;
182 } 182 }
183 183
184 setBacklight ( -3 ); 184 setBacklight ( -1 );
185 } 185 }
186 bool save( int level ) 186 bool save( int level )
187 { 187 {
188 switch ( level ) { 188 switch ( level ) {
189 case 0: 189 case 0:
190 if ( m_disable_suspend > 0 && m_enable_dim ) { 190 if ( m_disable_suspend > 0 && m_enable_dim ) {
191 if ( backlight() > 1 ) 191 if ( backlight() > 1 )
192 setBacklight( 1 ); // lowest non-off 192 setBacklight( 1 ); // lowest non-off
193 } 193 }
194 return true; 194 return true;
195 break; 195 break;
196 case 1: 196 case 1:
@@ -323,30 +323,32 @@ private:
323 323
324 int m_backlight_bright; 324 int m_backlight_bright;
325 bool m_backlight_forcedoff; 325 bool m_backlight_forcedoff;
326}; 326};
327 327
328 328
329void DesktopApplication::switchLCD ( bool on ) 329void DesktopApplication::switchLCD ( bool on )
330{ 330{
331 if ( qApp ) { 331 if ( qApp ) {
332 DesktopApplication *dapp = (DesktopApplication *) qApp; 332 DesktopApplication *dapp = (DesktopApplication *) qApp;
333 333
334 if ( dapp-> m_screensaver ) { 334 if ( dapp-> m_screensaver ) {
335 if ( on ) 335 if ( on ) {
336 dapp-> m_screensaver-> restore ( ); //setBacklight ( on ? -3 : -1 ); 336 dapp-> m_screensaver-> setDisplayState ( true );
337 else 337 dapp-> m_screensaver-> setBacklight ( -3 );
338 dapp-> m_screensaver-> save ( 1 ); 338 }
339 339 else {
340 } 340 dapp-> m_screensaver-> setDisplayState ( false );
341 }
342 }
341 } 343 }
342} 344}
343 345
344 346
345DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType ) 347DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
346 : QPEApplication( argc, argv, appType ) 348 : QPEApplication( argc, argv, appType )
347{ 349{
348 350
349 QTimer * t = new QTimer( this ); 351 QTimer * t = new QTimer( this );
350 connect( t, SIGNAL( timeout() ), this, SLOT( psTimeout() ) ); 352 connect( t, SIGNAL( timeout() ), this, SLOT( psTimeout() ) );
351 t->start( 10000 ); 353 t->start( 10000 );
352 ps = new PowerStatus; 354 ps = new PowerStatus;
@@ -853,43 +855,53 @@ void Desktop::execAutoStart()
853#include <linux/ioctl.h> 855#include <linux/ioctl.h>
854#include <time.h> 856#include <time.h>
855#endif 857#endif
856 858
857 859
858void Desktop::togglePower() 860void Desktop::togglePower()
859{ 861{
860 static bool excllock = false; 862 static bool excllock = false;
861 863
862 qDebug ( "togglePower (locked == %d)", excllock ? 1 : 0 ); 864 qDebug ( "togglePower (locked == %d)", excllock ? 1 : 0 );
863 865
864 if ( excllock ) 866 if ( excllock )
865 return ; 867 return;
866 868
867 excllock = true; 869 excllock = true;
868 870
869 bool wasloggedin = loggedin; 871 bool wasloggedin = loggedin;
870 loggedin = 0; 872 loggedin = 0;
871 suspendTime = QDateTime::currentDateTime(); 873 suspendTime = QDateTime::currentDateTime();
872 874
873 ODevice::inst ( ) -> suspend ( ); 875#ifdef QWS
876 if ( Password::needToAuthenticate ( true ) && qt_screen ) {
877 // Should use a big black window instead.
878 // But this would not show up fast enough
879 QGfx *g = qt_screen-> screenGfx ( );
880 g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
881 delete g;
882 }
883#endif
884
885 ODevice::inst ( )-> suspend ( );
874 886
875 QWSServer::screenSaverActivate ( false );
876 DesktopApplication::switchLCD ( true ); // force LCD on without slow qcop call 887 DesktopApplication::switchLCD ( true ); // force LCD on without slow qcop call
888 QWSServer::screenSaverActivate ( false );
877 889
878 { 890 {
879 QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep 891 QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
880 } 892 }
881 893
882 if ( wasloggedin ) 894 if ( wasloggedin )
883 login( TRUE ); 895 login ( true );
884 896
885 execAutoStart(); 897 execAutoStart();
886 //qcopBridge->closeOpenConnections(); 898 //qcopBridge->closeOpenConnections();
887 899
888 excllock = false; 900 excllock = false;
889} 901}
890 902
891void Desktop::toggleLight() 903void Desktop::toggleLight()
892{ 904{
893 QCopEnvelope e( "QPE/System", "setBacklight(int)" ); 905 QCopEnvelope e( "QPE/System", "setBacklight(int)" );
894 e << -2; // toggle 906 e << -2; // toggle
895} 907}
diff --git a/library/password.cpp b/library/password.cpp
index 4b22b65..6d126c4 100644
--- a/library/password.cpp
+++ b/library/password.cpp
@@ -18,25 +18,25 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "password.h" 20#include "password.h"
21#include "config.h" 21#include "config.h"
22#include "global.h" 22#include "global.h"
23#include "backend/contact.h" 23#include "backend/contact.h"
24#include <qlabel.h> 24#include <qlabel.h>
25#include <qlineedit.h> 25#include <qlineedit.h>
26#include <qtextview.h> 26#include <qtextview.h>
27#include <qstring.h> 27#include <qstring.h>
28#include <qapplication.h> 28#include <qapplication.h>
29#include <qfile.h> 29#include <qfile.h>
30#include <qwindowsystem_qws.h> 30//#include <qwindowsystem_qws.h>
31 31
32#include <qdialog.h> 32#include <qdialog.h>
33 33
34#include <unistd.h> //for sleep 34#include <unistd.h> //for sleep
35#include "passwordbase_p.h" 35#include "passwordbase_p.h"
36 36
37class PasswordDialog : public PasswordBase 37class PasswordDialog : public PasswordBase
38{ 38{
39 Q_OBJECT 39 Q_OBJECT
40 40
41public: 41public:
42 PasswordDialog( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 42 PasswordDialog( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
@@ -276,24 +276,43 @@ QString Password::getPassword( const QString& prompt )
276 if ( r == QDialog::Accepted ) { 276 if ( r == QDialog::Accepted ) {
277 if (pd.passw->text.isEmpty()) 277 if (pd.passw->text.isEmpty())
278 return ""; 278 return "";
279 else 279 else
280 return qcrypt(pd.passw->text,"a0"); 280 return qcrypt(pd.passw->text,"a0");
281 } else { 281 } else {
282 return QString::null; 282 return QString::null;
283 } 283 }
284} 284}
285 285
286 286
287/*! 287/*!
288 Return if a prompt for the user's passcode is needed.
289
290 If \a at_poweron is TRUE, the dialog is only used if the user's
291 preference request it at poweron
292
293 Opie extension to speed up suspend/resume.
294*/
295
296bool Password::needToAuthenticate(bool at_poweron)
297{
298 Config cfg("Security");
299 cfg.setGroup("Passcode");
300 QString passcode = cfg.readEntry("passcode");
301
302 return ( !passcode.isEmpty()
303 && (!at_poweron || cfg.readNumEntry("passcode_poweron",0)) );
304}
305
306/*!
288 Prompt, fullscreen, for the user's passcode until they get it right. 307 Prompt, fullscreen, for the user's passcode until they get it right.
289 308
290 If \a at_poweron is TRUE, the dialog is only used if the user's 309 If \a at_poweron is TRUE, the dialog is only used if the user's
291 preference request it at poweron; either way, the screen is always repainted 310 preference request it at poweron; either way, the screen is always repainted
292 by this function. (this functionality may move to the caller of this function). 311 by this function. (this functionality may move to the caller of this function).
293*/ 312*/
294 313
295void Password::authenticate(bool at_poweron) 314void Password::authenticate(bool at_poweron)
296{ 315{
297 Config cfg("Security"); 316 Config cfg("Security");
298 cfg.setGroup("Passcode"); 317 cfg.setGroup("Passcode");
299 QString passcode = cfg.readEntry("passcode"); 318 QString passcode = cfg.readEntry("passcode");
@@ -315,19 +334,20 @@ void Password::authenticate(bool at_poweron)
315 } 334 }
316 335
317 pd.reset(); 336 pd.reset();
318 pd.exec(); 337 pd.exec();
319 while (qcrypt(pd.passw->text, "a0") != passcode) { 338 while (qcrypt(pd.passw->text, "a0") != passcode) {
320 if (oi) 339 if (oi)
321 oi->exec(); 340 oi->exec();
322 pd.reset(); 341 pd.reset();
323 pd.exec(); 342 pd.exec();
324 } 343 }
325 } else if ( at_poweron ) { 344 } else if ( at_poweron ) {
326 // refresh screen #### should probably be in caller 345 // refresh screen #### should probably be in caller
327 // Not needed (we took away the screen blacking) 346 // Not needed (we took away the screen blacking) TT
347 // Not needed (we have intelligent screen blacking) sandman
328 //if ( qwsServer ) 348 //if ( qwsServer )
329 //qwsServer->refresh(); 349 //qwsServer->refresh();
330 } 350 }
331} 351}
332 352
333#include "password.moc" 353#include "password.moc"
diff --git a/library/password.h b/library/password.h
index a3a3e45..a2f2c3c 100644
--- a/library/password.h
+++ b/library/password.h
@@ -16,17 +16,18 @@
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#ifndef PASSWORD_H 20#ifndef PASSWORD_H
21#define PASSWORD_H 21#define PASSWORD_H
22 22
23#include <qstring.h> 23#include <qstring.h>
24 24
25class Password 25class Password
26{ 26{
27public: 27public:
28 static bool needToAuthenticate(bool atpoweron=FALSE); // Opie extension to speed up suspend/resume (sandman)
28 static void authenticate(bool atpoweron=FALSE); 29 static void authenticate(bool atpoweron=FALSE);
29 static QString getPassword( const QString& prompt ); 30 static QString getPassword( const QString& prompt );
30}; 31};
31 32
32#endif // PASSWORD_H 33#endif // PASSWORD_H