summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-03-18 21:28:36 (UTC)
committer harlekin <harlekin>2002-03-18 21:28:36 (UTC)
commitd41e6d2ed4caeabf78ab08bde7d4f5866c9eeb04 (patch) (unidiff)
treeed3c5c8d2eea0001b954a34ecb4a496fa9a6a484
parente6d3c651634eee7ff54675cc060ae94bd3ef41bd (diff)
downloadopie-d41e6d2ed4caeabf78ab08bde7d4f5866c9eeb04.zip
opie-d41e6d2ed4caeabf78ab08bde7d4f5866c9eeb04.tar.gz
opie-d41e6d2ed4caeabf78ab08bde7d4f5866c9eeb04.tar.bz2
tweaked the suspend code a bit, maybe with a delay it works better
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 680cc06..547daa9 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -512,105 +512,108 @@ void Desktop::execAutoStart()
512 cfg.setGroup( "AutoStart" ); 512 cfg.setGroup( "AutoStart" );
513 appName = cfg.readEntry("Apps", ""); 513 appName = cfg.readEntry("Apps", "");
514 QCopEnvelope e("QPE/System", "execute(QString)"); 514 QCopEnvelope e("QPE/System", "execute(QString)");
515 e << QString(appName); 515 e << QString(appName);
516} 516}
517 517
518#if defined(QPE_HAVE_TOGGLELIGHT) 518#if defined(QPE_HAVE_TOGGLELIGHT)
519#include <qpe/config.h> 519#include <qpe/config.h>
520 520
521#include <sys/ioctl.h> 521#include <sys/ioctl.h>
522#include <sys/types.h> 522#include <sys/types.h>
523#include <fcntl.h> 523#include <fcntl.h>
524#include <unistd.h> 524#include <unistd.h>
525#include <errno.h> 525#include <errno.h>
526#include <linux/ioctl.h> 526#include <linux/ioctl.h>
527#include <time.h> 527#include <time.h>
528#endif 528#endif
529 529
530static bool blanked=FALSE; 530static bool blanked=FALSE;
531 531
532static void blankScreen() 532static void blankScreen()
533{ 533{
534 if ( !qt_screen ) return; 534 if ( !qt_screen ) return;
535 /* Should use a big black window instead. 535 /* Should use a big black window instead.
536 QGfx* g = qt_screen->screenGfx(); 536 QGfx* g = qt_screen->screenGfx();
537 g->fillRect(0,0,qt_screen->width(),qt_screen->height()); 537 g->fillRect(0,0,qt_screen->width(),qt_screen->height());
538 delete g; 538 delete g;
539 */ 539 */
540 blanked = TRUE; 540 blanked = TRUE;
541} 541}
542 542
543static void darkScreen() 543static void darkScreen()
544{ 544{
545 extern void qpe_setBacklight(int); 545 extern void qpe_setBacklight(int);
546 qpe_setBacklight(0); // force off 546 qpe_setBacklight(0); // force off
547} 547}
548 548
549 549
550void Desktop::togglePower() 550void Desktop::togglePower()
551{ 551{
552 bool wasloggedin = loggedin; 552 bool wasloggedin = loggedin;
553 loggedin=0; 553 loggedin=0;
554 darkScreen(); 554 darkScreen();
555 if ( wasloggedin ) 555 if ( wasloggedin )
556 blankScreen(); 556 blankScreen();
557 557
558 system("apm --suspend"); 558 system("apm --suspend");
559 559
560 sleep(2);
561
560 QWSServer::screenSaverActivate( FALSE ); 562 QWSServer::screenSaverActivate( FALSE );
561 { 563 {
562 QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep 564 QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
563 QCopEnvelope e("QPE/System", "setBacklight(int)"); 565 QCopEnvelope e("QPE/System", "setBacklight(int)");
564 e << -3; // Force on 566 e << -3; // Force on
565 } 567 }
566 if ( wasloggedin ) { 568 if ( wasloggedin ) {
567 login(TRUE); 569 login(TRUE);
568 } 570 }
571
569 execAutoStart(); 572 execAutoStart();
570 //qcopBridge->closeOpenConnections(); 573 //qcopBridge->closeOpenConnections();
571 //qDebug("called togglePower()!!!!!!"); 574 //qDebug("called togglePower()!!!!!!");
572} 575}
573 576
574void Desktop::toggleLight() 577void Desktop::toggleLight()
575{ 578{
576 QCopEnvelope e("QPE/System", "setBacklight(int)"); 579 QCopEnvelope e("QPE/System", "setBacklight(int)");
577 e << -2; // toggle 580 e << -2; // toggle
578} 581}
579 582
580void Desktop::toggleSymbolInput() 583void Desktop::toggleSymbolInput()
581{ 584{
582 tb->toggleSymbolInput(); 585 tb->toggleSymbolInput();
583} 586}
584 587
585void Desktop::toggleNumLockState() 588void Desktop::toggleNumLockState()
586{ 589{
587 tb->toggleNumLockState(); 590 tb->toggleNumLockState();
588} 591}
589 592
590void Desktop::toggleCapsLockState() 593void Desktop::toggleCapsLockState()
591{ 594{
592 tb->toggleCapsLockState(); 595 tb->toggleCapsLockState();
593} 596}
594 597
595void Desktop::styleChange( QStyle &s ) 598void Desktop::styleChange( QStyle &s )
596{ 599{
597 QWidget::styleChange( s ); 600 QWidget::styleChange( s );
598 int displayw = qApp->desktop()->width(); 601 int displayw = qApp->desktop()->width();
599 int displayh = qApp->desktop()->height(); 602 int displayh = qApp->desktop()->height();
600 603
601 QSize sz = tb->sizeHint(); 604 QSize sz = tb->sizeHint();
602 605
603 tb->setGeometry( 0, displayh-sz.height(), displayw, sz.height() ); 606 tb->setGeometry( 0, displayh-sz.height(), displayw, sz.height() );
604} 607}
605 608
606void DesktopApplication::shutdown() 609void DesktopApplication::shutdown()
607{ 610{
608 if ( type() != GuiServer ) 611 if ( type() != GuiServer )
609 return; 612 return;
610 ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); 613 ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
611 connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)), 614 connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)),
612 this, SLOT(shutdown(ShutdownImpl::Type)) ); 615 this, SLOT(shutdown(ShutdownImpl::Type)) );
613 sd->showMaximized(); 616 sd->showMaximized();
614} 617}
615 618
616void DesktopApplication::shutdown( ShutdownImpl::Type t ) 619void DesktopApplication::shutdown( ShutdownImpl::Type t )