On start runs /etc/init.d/bluetooth stop.

On setBluezStatus runs /etc/init.d/bluetooth start or stop.
If "listDevices()" is called prior to "enableBluetooth()", postpone the action.
If BT was enabled befor "enableBluetooth()" was received, do not disable it on "disableBluetooth()".
Timer period became twice shorter.
When "listDevices()" received, show browsing icon.
Added OPIE120 for compatibility.

2 files changed, 114 insertions, 35 deletions

diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 5676e4f..9c6c71d 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -13,190 +13,243 @@
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|     MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>:      PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .     .:        details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=            this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #include "bluezapplet.h"
 
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
 #include <opie2/odevice.h>
 #include <opie2/odebug.h>
 #include <opie2/oresource.h>
+#include <opie2/oprocess.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qapplication.h>
 #include <qpoint.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
+#include <qmessagebox.h>
 
 /* STD */
 #include <device.h>
 
-namespace OpieTooth {
+// #define OPIE120 // undefine it fo the latest OPIE
 
+namespace OpieTooth {
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
         setFixedHeight( AppLnk::smallIconSize() );
         setFixedWidth( AppLnk::smallIconSize() );
+#ifdef OPIE120
+        bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
+        bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
+        bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" );
+#else
         bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
         bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
         bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon );
-        startTimer(4000);
+#endif
+        startTimer(2000);
         btDevice = 0;
         btManager = 0;
         bluezactive = false;
         bluezDiscoveryActive = false;
+        doListDevice = false;
+        isScanning = false;
+        m_wasOn = false;
 
         // TODO: determine whether this channel has to be closed at destruction time.
         QCopChannel* chan = new QCopChannel("QPE/Bluetooth", this );
         connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
                 this, SLOT(slotMessage(const QCString&,const QByteArray&) ) );
+
+        OProcess* btstart = new OProcess();
+        *btstart << "/etc/init.d/bluetooth" << "stop";
+        btstart->setUseShell(true);
+        if (!btstart->start(OProcess::DontCare, OProcess::AllOutput))
+            delete btstart;
+        else {
+            connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)),
+                this, SLOT(slotProcessExited(Opie::Core::OProcess*)));
+        }
     }
 
     BluezApplet::~BluezApplet() {
         if ( btDevice ) {
             delete btDevice;
         }
         if ( btManager ) {
             delete btManager;
         }
     }
 
 int BluezApplet::position()
 {
         return 6;
 }
 
 
     bool BluezApplet::checkBluezStatus() {
         if (btDevice) {
             if (btDevice->isLoaded() ) {
                 return true;
             } else {
                 return false;
             }
         } else {
             return false;
         }
     }
 
     int BluezApplet::setBluezStatus(int c) {
 
+        OProcess* btstart = new OProcess();
         if ( c == 1 ) {
             switch ( ODevice::inst()->model() ) {
             case Model_iPAQ_H39xx:
                 btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
                 break;
 
-            case Model_iPAQ_H5xxx:
-                btDevice = new Device( "/dev/tts/1", "any", "921600" );
-                break;
+            case Model_iPAQ_H5xxx:
+                btDevice = new Device( "/dev/tts/1", "any", "921600" );
+                break;
 
+#ifndef OPIE120
             case Model_MyPal_716:
                 btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" );
                 break;
+#endif
 
             default:
                 btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" );
                 break;
             }
+            *btstart << "/etc/init.d/bluetooth" << "start";
+            btstart->setUseShell(true);
+            if (!btstart->start(OProcess::DontCare, OProcess::AllOutput))
+              delete btstart;
+            else {
+                connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)),
+                    this, SLOT(slotProcessExited(Opie::Core::OProcess*)));
+            }
         } else {
+            *btstart << "/etc/init.d/bluetooth" << "stop";
+            btstart->setUseShell(true);
+            if (!btstart->start(OProcess::DontCare, OProcess::AllOutput))
+              delete btstart;
+            else {
+                connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)),
+                    this, SLOT(slotProcessExited(Opie::Core::OProcess*)));
+            }
             if ( btDevice ) {
                 delete btDevice;
                 btDevice = 0;
             }
        }
         return 0;
     }
 
     int BluezApplet::checkBluezDiscoveryStatus() {
-      return bluezDiscoveryActive;
+      return isScanning;
     }
 
     int BluezApplet::setBluezDiscoveryStatus(int d) {
-      return bluezDiscoveryActive=d;
+      return bluezDiscoveryActive = d;
     }
 
     // FIXME mbhaynie
     // receiver for QCopChannel("QPE/Bluetooth") messages.
     void BluezApplet::slotMessage( const QCString& str, const QByteArray& )
     {
-        if ( str == "enableBluetooth()") {
-            if (!checkBluezStatus())  {
-                setBluezStatus(1);
-            }
-        } else if ( str == "disableBluetooth()") {
-            if (checkBluezStatus())  {
-                // setBluezStatus(0);
-            }
-        } else if ( str == "listDevices()") {
-            if (!btManager)
-            {
-                btManager = new Manager("hci0");
-                connect( btManager, SIGNAL( foundDevices(const QString&,RemoteDevice::ValueList) ),
-                         this, SLOT( fillList(const QString&,RemoteDevice::ValueList) ) ) ;
+        if ( str == "enableBluetooth()") {
+            m_wasOn = checkBluezStatus();
+            if (!m_wasOn) {
+                setBluezStatus(1);
+                sleep(2);
+            }
+        }
+        else if ( str == "disableBluetooth()") {
+            /*
+             * We can down BT only if it was started by qcop. We don't want 
+             * to down BT started from menu an break our networking connection
+             */
+            if (checkBluezStatus() && !m_wasOn)
+                setBluezStatus(0);
+            doListDevice = false;
             }
-
-            btManager->searchDevices();
-        }
+        else if ( str == "listDevices()") {
+            if (checkBluezStatus()) {
+                doListDevice = false;
+                timerEvent(0);
+                if (!btManager) {
+                    btManager = new Manager("hci0");
+                    connect( btManager, 
+                        SIGNAL( foundDevices(const QString&, RemoteDevice::ValueList) ),
+                        this, SLOT( fillList(const QString&, RemoteDevice::ValueList) ) ) ;
+                }
+                btManager->searchDevices();
+                isScanning = true;
+            } else
+                doListDevice = true;
+        }
     }
 
     // Once the hcitool scan is complete, report back.
     void BluezApplet::fillList(const QString&, RemoteDevice::ValueList deviceList)
     {
-        QCopEnvelope e("QPE/BluetoothBack", "devices(QStringMap)");
+        QCopEnvelope e("QPE/BluetoothBack", "devices(QStringMap)");
 
-        QStringList list;
-        QMap<QString, QString> btmap;
+        QMap<QString, QString> btmap;
 
         RemoteDevice::ValueList::Iterator it;
         for( it = deviceList.begin(); it != deviceList.end(); ++it )
-        {
-            btmap[(*it).name()] = (*it).mac();
-        }
+            btmap[(*it).name()] = (*it).mac();
 
-        e << btmap;
+        e << btmap;
+        isScanning = false;
+        timerEvent( 0 );
     }
 
     void BluezApplet::mousePressEvent( QMouseEvent *) {
 
         QPopupMenu *menu = new QPopupMenu();
         QPopupMenu *signal = new QPopupMenu();
         int ret=0;
 
         /* Refresh active state */
         timerEvent( 0 );
 
 
         if (bluezactive) {
             menu->insertItem( tr("Disable Bluetooth"), 0 );
         } else {
             menu->insertItem( tr("Enable Bluetooth"), 1 );
         }
 
         menu->insertItem( tr("Launch manager"), 2 );
 
         menu->insertSeparator(6);
         //menu->insertItem( tr("Signal strength"), signal,  5);
         //menu->insertSeparator(8);
 
@@ -239,51 +292,73 @@ int BluezApplet::position()
         delete signal;
         delete menu;
     }
 
 
 /**
  * Launches the bluetooth manager
  */
     void BluezApplet::launchManager() {
         QCopEnvelope e("QPE/System", "execute(QString)");
         e << QString("bluetooth-manager");
     }
 
 /**
  * Refresh timer
  * @param the timer event
  */
     void BluezApplet::timerEvent( QTimerEvent * ) {
         bool oldactive = bluezactive;
         int olddiscovery = bluezDiscoveryActive;
 
         bluezactive = checkBluezStatus();
         bluezDiscoveryActive = checkBluezDiscoveryStatus();
 
-        if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) {
+        if ((bluezactive != oldactive) || 
+            (bluezDiscoveryActive != olddiscovery))
             update();
+        if (bluezactive && doListDevice) {
+            const QByteArray arr;
+            slotMessage("listDevices()", arr);
         }
     }
 
 /**
  * Implementation of the paint event
  * @param the QPaintEvent
  */
     void BluezApplet::paintEvent( QPaintEvent* ) {
         QPainter p(this);
         odebug << "paint bluetooth pixmap" << oendl; 
 
-        if (bluezactive > 0) {
+        if (bluezactive) {
+#ifdef OPIE120
+            p.drawPixmap( 0, -1,  bluezOnPixmap );
+#else
             p.drawPixmap( 0, 0,  bluezOnPixmap );
+#endif
         } else {
+#ifdef OPIE120
+            p.drawPixmap( 0, -1,  bluezOffPixmap );
+#else
             p.drawPixmap( 0, 0,  bluezOffPixmap );
+#endif
         }
 
-        if (bluezDiscoveryActive > 0) {
+        if (bluezDiscoveryActive) {
             p.drawPixmap( 0, 0,  bluezDiscoveryOnPixmap );
         }
     }
+
+/**
+ * Implementation of the process finish
+ * @param the finished process
+ */
+    void BluezApplet::slotProcessExited(OProcess* proc) 
+    {
+        delete proc;
+    }
 };
 
+
 EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet )
 
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h
index c096e29..85022bb 100644
--- a/noncore/net/opietooth/applet/bluezapplet.h
+++ b/noncore/net/opietooth/applet/bluezapplet.h
@@ -12,68 +12,72 @@
     .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|     MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>:      PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .     .:        details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=            this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef __BLUEZAPPLET_H__
 #define __BLUEZAPPLET_H__
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qtimer.h>
 #include <manager.h>
+#include <opie2/oprocess.h>
 
 namespace OpieTooth {
     class Device;
 
     class BluezApplet : public QWidget {
         Q_OBJECT
     public:
         BluezApplet( QWidget *parent = 0, const char *name=0 );
         ~BluezApplet();
         static int position();
     protected:
         void timerEvent(QTimerEvent *te );
 
 public slots:
         void fillList( const QString& device, RemoteDevice::ValueList list );
 
     private:
         void mousePressEvent( QMouseEvent * );
         void paintEvent( QPaintEvent* );
         void launchManager();
         bool checkBluezStatus();
         int setBluezStatus(int);
         int checkBluezDiscoveryStatus();
         int setBluezDiscoveryStatus(int);
 
     private:
         Device* btDevice;
         Manager *btManager;
         QPixmap bluezOnPixmap;
         QPixmap bluezOffPixmap;
         QPixmap bluezDiscoveryOnPixmap;
         bool bluezactive;
         bool bluezDiscoveryActive;
+        bool doListDevice; //If I have to list devices after bringing BT up?
+        bool isScanning; //If I'm scanning devices
+        bool m_wasOn; //If BT was started by menu?
 
 private slots:
         void slotMessage( const QCString& , const QByteArray& );
-
+        void slotProcessExited(Opie::Core::OProcess* proc);
 
     };
 };
 
 
 #endif