Removed the button mapping for H3800, since this is now handled in the

ODevice iPAQ keyfilter

2 files changed, 10 insertions, 31 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 4640a12..68949e6 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -1,244 +1,246 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "desktop.h"
 #include "info.h"
 #include "launcher.h"
 //#include "mrulist.h"
 #include "qcopbridge.h"
 #include "shutdownimpl.h"
 #include "startmenu.h"
 #include "taskbar.h"
 #include "transferserver.h"
 #include "irserver.h"
 #include "packageslave.h"
 
 #include <qpe/applnk.h>
 #include <qpe/mimetype.h>
 #include <qpe/password.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/timeconversion.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/network.h>
 #include <qpe/global.h>
 
 #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ )
 #include <qpe/custom.h>
 #endif
 
 #include <opie/odevice.h>
 
 #include <qgfx_qws.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 
 #include <qvaluelist.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 
+using namespace Opie;
+
 class QCopKeyRegister
 {
 public:
   QCopKeyRegister() : keyCode( 0 )
   { }
   QCopKeyRegister( int k, const QString &c, const QString &m )
       : keyCode( k ), channel( c ), message( m )
   { }
 
   int getKeyCode() const
   {
     return keyCode;
   }
   QString getChannel() const
   {
     return channel;
   }
   QString getMessage() const
   {
     return message;
   }
 
 private:
   int keyCode;
   QString channel, message;
 };
 
 typedef QValueList<QCopKeyRegister> KeyRegisterList;
 KeyRegisterList keyRegisterList;
 
 static Desktop* qpedesktop = 0;
 static int loggedin = 0;
 static void login( bool at_poweron )
 {
   if ( !loggedin ) {
     Global::terminateBuiltin( "calibrate" );
     Password::authenticate( at_poweron );
     loggedin = 1;
     QCopEnvelope e( "QPE/Desktop", "unlocked()" );
   }
 }
 
 bool Desktop::screenLocked()
 {
   return loggedin == 0;
 }
 
 /*
   Priority is number of alerts that are needed to pop up
   alert.
  */
 class DesktopPowerAlerter : public QMessageBox
 {
 public:
   DesktopPowerAlerter( QWidget *parent, const char *name = 0 )
       : QMessageBox( tr( "Battery Status" ), "Low Battery",
                      QMessageBox::Critical,
                      QMessageBox::Ok | QMessageBox::Default,
                      QMessageBox::NoButton, QMessageBox::NoButton,
                      parent, name, FALSE )
   {
     currentPriority = INT_MAX;
     alertCount = 0;
   }
 
   void alert( const QString &text, int priority );
   void hideEvent( QHideEvent * );
 private:
   int currentPriority;
   int alertCount;
 };
 
 void DesktopPowerAlerter::alert( const QString &text, int priority )
 {
   alertCount++;
   if ( alertCount < priority )
     return ;
   if ( priority > currentPriority )
     return ;
   currentPriority = priority;
   setText( text );
   show();
 }
 
 
 void DesktopPowerAlerter::hideEvent( QHideEvent *e )
 {
   QMessageBox::hideEvent( e );
   alertCount = 0;
   currentPriority = INT_MAX;
 }
 
 
 class QPEScreenSaver : public QWSScreenSaver
 {
 private:
   int LcdOn;
 
 public:
   QPEScreenSaver()
   {
     m_disable_suspend = 100;
     m_enable_dim = false;
     m_enable_lightoff = false;
     m_enable_onlylcdoff = false;
 
     m_lcd_status = true;
 
     m_backlight_bright = -1;
     m_backlight_forcedoff = false;
 
     // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
     ODevice::inst ( ) -> setDisplayStatus ( true );
   }
   void restore()
   {
     if ( !m_lcd_status )     // We must have turned it off
       ODevice::inst ( ) -> setDisplayStatus ( true );
 
-    setBacklight ( -1 );
+    setBacklight ( -3 );
   }
   bool save( int level )
   {
     switch ( level ) {
       case 0:
         if ( m_disable_suspend > 0 && m_enable_dim ) {
           if ( backlight() > 1 )
             setBacklight( 1 ); // lowest non-off
         }
         return true;
         break;
       case 1:
         if ( m_disable_suspend > 1 && m_enable_lightoff ) {
           setBacklight( 0 ); // off
         }
         return true;
         break;
       case 2:
         if ( m_enable_onlylcdoff ) {
           ODevice::inst ( ) -> setDisplayStatus ( false );
           m_lcd_status = false;
           return true;
         }
         else // We're going to suspend the whole machine
         {
           if ( ( m_disable_suspend > 2 ) &&
                   ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) &&
                   ( !Network::networkOnline ( ) ) ) {
             QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
             return true;
           }
         }
         break;
     }
     return false;
   }
 
 private:
   static int ssi( int interval, Config & config, const QString & enable, const QString & value, int def )
   {
     if ( !enable.isEmpty() && config.readNumEntry( enable, 0 ) == 0 )
       return 0;
 
     if ( interval < 0 ) {
       // Restore screen blanking and power saving state
       interval = config.readNumEntry( value, def );
     }
     return interval;
   }
 
 public:
   void setIntervals( int i1, int i2, int i3 )
   {
     Config config( "qpe" );
     config.setGroup( "Screensaver" );
 
     int v[ 4 ];
     i1 = ssi( i1, config, "Dim", "Interval_Dim", 30 );
     i2 = ssi( i2, config, "LightOff", "Interval_LightOff", 20 );
     i3 = ssi( i3, config, "", "Interval", 60 );
 
     //qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
 
     v [ 0 ] = QMAX( 1000 * i1, 100 );
@@ -258,130 +260,135 @@ public:
   void setInterval ( int interval )
   {
     setIntervals ( -1, -1, interval );
   }
 
   void setMode ( int mode )
   {
     if ( mode > m_disable_suspend )
       setInterval( -1 );
     m_disable_suspend = mode;
   }
 
   int backlight ( )
   {
     if ( m_backlight_bright == -1 ) {
       // Read from config
       Config config ( "qpe" );
       config. setGroup ( "Screensaver" );
       m_backlight_bright = config. readNumEntry ( "Brightness", 255 );
     }
     return m_backlight_bright;
   }
 
   void setBacklight ( int bright )
   {
     if ( bright == -3 ) {
       // Forced on
       m_backlight_forcedoff = false;
       bright = -1;
     }
     if ( m_backlight_forcedoff && bright != -2 )
       return ;
     if ( bright == -2 ) {
       // Toggle between off and on
       bright = m_backlight_bright ? 0 : -1;
       m_backlight_forcedoff = !bright;
     }
 
     m_backlight_bright = bright;
 
     bright = backlight ( );
     ODevice::inst ( ) -> setDisplayBrightness ( bright );
 
     m_backlight_bright = bright;
   }
 
 private:
   int m_disable_suspend;
   bool m_enable_dim;
   bool m_enable_lightoff;
   bool m_enable_onlylcdoff;
 
   bool m_lcd_status;
 
   int m_backlight_bright;
   bool m_backlight_forcedoff;
 };
 
 
 void DesktopApplication::switchLCD ( bool on )
 {
   if ( qApp ) {
     DesktopApplication *dapp = (DesktopApplication *) qApp;
 
-    if ( dapp-> m_screensaver )
-      dapp-> m_screensaver-> setBacklight ( on ? -3 : -1 );
+    if ( dapp-> m_screensaver ) {
+      if ( on )
+            dapp-> m_screensaver-> restore ( ); //setBacklight ( on ? -3 : -1 );
+          else
+            dapp-> m_screensaver-> save ( 1 );
+          
+        }
   }
 }
 
 
 DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
     : QPEApplication( argc, argv, appType )
 {
 
   QTimer * t = new QTimer( this );
   connect( t, SIGNAL( timeout() ), this, SLOT( psTimeout() ) );
   t->start( 10000 );
   ps = new PowerStatus;
   pa = new DesktopPowerAlerter( 0 );
 
   channel = new QCopChannel( "QPE/Desktop", this );
   connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
            this, SLOT( desktopMessage( const QCString&, const QByteArray& ) ) );
 
   channel = new QCopChannel( "QPE/System", this );
   connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
            this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) );
 
   m_screensaver = new QPEScreenSaver;
 
   m_screensaver-> setInterval ( -1 );
   QWSServer::setScreenSaver( m_screensaver );
 }
 
 
 DesktopApplication::~DesktopApplication()
 {
   delete ps;
   delete pa;
 }
 
 void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &data )
 {
 #ifdef Q_WS_QWS
   QDataStream stream( data, IO_ReadOnly );
   if ( msg == "keyRegister(int key, QString channel, QString message)" ) {
     int k;
     QString c, m;
     stream >> k;
     stream >> c;
     stream >> m;
 
     qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m );
     keyRegisterList.append( QCopKeyRegister( k, c, m ) );
   }
   else if ( msg == "suspend()" ) {
     emit power();
   }
 #endif
 }
 
 
 void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data )
 {
 #ifdef Q_WS_QWS
   QDataStream stream ( data, IO_ReadOnly );
 
   if ( msg == "setScreenSaverInterval(int)" ) {
     int time;
     stream >> time;
@@ -945,91 +952,64 @@ void DesktopApplication::restart()
 
   exit( 1 );
 #endif
 }
 
 void Desktop::startTransferServer()
 {
   // start qcop bridge server
   qcopBridge = new QCopBridge( 4243 );
   if ( !qcopBridge->ok() ) {
     delete qcopBridge;
     qcopBridge = 0;
   }
   // start transfer server
   transferServer = new TransferServer( 4242 );
   if ( !transferServer->ok() ) {
     delete transferServer;
     transferServer = 0;
   }
   if ( !transferServer || !qcopBridge )
     startTimer( 2000 );
 }
 
 void Desktop::timerEvent( QTimerEvent *e )
 {
   killTimer( e->timerId() );
   startTransferServer();
 }
 
 void Desktop::terminateServers()
 {
   delete transferServer;
   delete qcopBridge;
   transferServer = 0;
   qcopBridge = 0;
 }
 
 void Desktop::rereadVolumes()
 {
   Config cfg( "qpe" );
   cfg.setGroup( "Volume" );
   touchclick = cfg.readBoolEntry( "TouchSound" );
   keyclick = cfg.readBoolEntry( "KeySound" );
   alarmsound = cfg.readBoolEntry( "AlarmSound" );
 }
 
 void Desktop::keyClick()
 {
   if ( keyclick )
     ODevice::inst ( ) -> keySound ( );
 }
 
 void Desktop::screenClick()
 {
   if ( touchclick )
     ODevice::inst ( ) -> touchSound ( );
 }
 
 void Desktop::soundAlarm()
 {
   if ( qpedesktop-> alarmsound )
     ODevice::inst ( ) -> alarmSound ( );
 }
 
-bool Desktop::eventFilter( QObject *, QEvent *ev )
-{
-  if ( ev-> type ( ) == QEvent::KeyPress ) {
-    QKeyEvent * ke = ( QKeyEvent * ) ev;
-    if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key
-      QWidget * active = qApp-> activeWindow ( );
-
-      if ( active && active-> isPopup ( ) )
-        active->close();
-
-      /*
-       * On iPAQ 38xx that key is not the "menu key" but the mail key
-       * To not confuse the users, make it launch the mail app on 38xx
-       */
-      if ( ODevice::inst() ->model() == OMODEL_iPAQ_H38xx ) {
-        QCopEnvelope e( "QPE/System", "execute(QString)" );
-        e << QString( "mail" );
-        return true;
-      }
-      else {
-        raiseMenu ( );
-        return true;
-      }
-    }
-  }
-  return false;
-}
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index b9ff39f..f7c3e3f 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -61,85 +61,84 @@ signals:
         void capsLockStateToggle();
         void prepareForRestart();
 
 protected:
 #ifdef Q_WS_QWS
 
         bool qwsEventFilter( QWSEvent * );
 #endif
 
         void shutdown();
         void restart();
 
 public slots:
         virtual void desktopMessage ( const QCString &msg, const QByteArray &data );
         virtual void systemMessage ( const QCString &msg, const QByteArray &data );
 
 protected slots:
         void shutdown( ShutdownImpl::Type );
         void psTimeout();
         void sendCard();
 private:
         DesktopPowerAlerter *pa;
         PowerStatus *ps;
         QTimer *cardSendTimer;
         QCopChannel *channel;
         QPEScreenSaver *m_screensaver;
 };
 
 
 class Desktop : public QWidget
 {
         Q_OBJECT
 public:
         Desktop();
         ~Desktop();
 
         static bool screenLocked();
 
         void show();
         void checkMemory();
 
         void keyClick();
         void screenClick();
         static void soundAlarm();
 
 public slots:
         void raiseDatebook();
         void raiseContacts();
         void raiseMenu();
         void raiseLauncher();
         void raiseEmail();
         void execAutoStart();
         void togglePower();
         void toggleLight();
         void toggleNumLockState();
         void toggleCapsLockState();
         void toggleSymbolInput();
         void terminateServers();
         void rereadVolumes();
 
 protected:
         void executeOrModify( const QString& appLnkFile );
         void styleChange( QStyle & );
         void timerEvent( QTimerEvent *e );
-        bool eventFilter( QObject *, QEvent * );
 
         QWidget *bg;
         Launcher *launcher;
         TaskBar *tb;
 
 private:
         void startTransferServer();
         bool recoverMemory();
 
         QCopBridge *qcopBridge;
         TransferServer *transferServer;
         PackageSlave *packageSlave;
 
         QDateTime suspendTime;
         bool keyclick, touchclick, alarmsound;
 };
 
 
 #endif // __DESKTOP_H__