Restore binary compatibility and make use of the virtual_hook

Yeah it is ugly... but will work for libopie...
Now onto libopie2! development

2 files changed, 107 insertions, 29 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index c5a916b..c5342e1 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -66,24 +66,25 @@ public:
 
         QString m_systemstr;
         OSystem m_system;
 
         QString m_sysverstr;
 
         Transformation m_rotation;
         ODirection m_direction;
 
         QValueList <ODeviceButton> *m_buttons;
         uint                        m_holdtime;
         QStrList                   *m_cpu_frequencies;
+
 };
 
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter {
 protected:
         virtual void init ( );
         virtual void initButtons ( );
 
 public:
         virtual bool setSoftSuspend ( bool soft );
 
         virtual bool setDisplayBrightness ( int b );
         virtual int displayBrightnessResolution ( ) const;
@@ -131,39 +132,40 @@ public:
         virtual bool setDisplayBrightness ( int b );
         virtual int displayBrightnessResolution ( ) const;
 
         virtual void alarmSound ( );
         virtual void keySound ( );
         virtual void touchSound ( );
 
         virtual QValueList <OLed> ledList ( ) const;
         virtual QValueList <OLedState> ledStateList ( OLed led ) const;
         virtual OLedState ledState ( OLed led ) const;
         virtual bool setLedState ( OLed led, OLedState st );
 
-        virtual bool hasHingeSensor() const;
-        virtual OHingeStatus readHingeSensor();
+        bool hasHingeSensor() const;
+        OHingeStatus readHingeSensor();
 
         static bool isZaurus();
 
         // Does this break BC?
         virtual bool suspend ( );
-        virtual Transformation rotation ( ) const;
-        virtual ODirection direction ( ) const;
+        Transformation rotation ( ) const;
+        ODirection direction ( ) const;
 
 protected:
         virtual void buzzer ( int snd );
 
         OLedState m_leds [1];
         bool m_embedix;
+        void virtual_hook( int id, void *data );
 };
 
 class SIMpad : public ODevice, public QWSServer::KeyboardFilter {
 protected:
         virtual void init ( );
         virtual void initButtons ( );
 
 public:
         virtual bool setSoftSuspend ( bool soft );
         virtual bool suspend();
 
         virtual bool setDisplayStatus( bool on );
@@ -435,25 +437,25 @@ static QCString makeChannel ( const char *str )
                 return str;
 }
 
 static inline bool isQWS()
 {
         return qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false;
 }
 
 ODevice *ODevice::inst ( )
 {
         static ODevice *dev = 0;
 
-                if ( !dev ) {   
+        if ( !dev ) {
                 if ( QFile::exists ( "/proc/hal/model" ))
                         dev = new iPAQ ( );
                 else if ( Zaurus::isZaurus() )
                         dev = new Zaurus ( );
                 else if ( QFile::exists ( "/proc/ucb1x00" ) && QFile::exists ( "/proc/cs3" ))
                         dev = new SIMpad ( );
                 else if ( QFile::exists ( "/proc/sys/board/name" ))
                         dev = new Ramses ( );
                 else if ( Yopy::isYopy() )
                         dev = new Yopy ( );
                 else if ( Jornada::isJornada() )
                         dev = new Jornada ( );
@@ -719,33 +721,39 @@ OSystem ODevice::system ( ) const
  * @return the version string of the base system
  */
 QString ODevice::systemVersionString ( ) const
 {
         return d-> m_sysverstr;
 }
 
 /**
  *  @return the current Transformation
  */
 Transformation ODevice::rotation ( ) const
 {
-        return d-> m_rotation;
+    VirtRotation rot;
+    ODevice* that =(ODevice* )this;
+    that->virtual_hook( VIRTUAL_ROTATION, &rot );
+    return rot.trans;
 }
 
 /**
  *  @return the current rotation direction
  */
 ODirection ODevice::direction ( ) const
 {
-        return d-> m_direction;
+    VirtDirection dir;
+    ODevice* that =(ODevice* )this;
+    that->virtual_hook( VIRTUAL_DIRECTION, &dir );
+    return dir.direct;
 }
 
 /**
  * This plays an alarmSound
  */
 void ODevice::alarmSound ( )
 {
 #ifndef QT_NO_SOUND
         static Sound snd ( "alarm" );
 
         if ( snd. isFinished ( ))
                 snd. play ( );
@@ -837,33 +845,38 @@ int ODevice::readLightSensor ( )
  * @return the light sensor resolution
  */
 int ODevice::lightSensorResolution ( ) const
 {
         return 0;
 }
 
 /**
  * @return if the device has a hinge sensor
  */
 bool ODevice::hasHingeSensor ( ) const
 {
-        return false;
+    VirtHasHinge hing;
+    ODevice* that =(ODevice* )this;
+    that->virtual_hook( VIRTUAL_HAS_HINGE, &hing );
+    return hing.hasHinge;
 }
 
 /**
  * @return a value from the hinge sensor
  */
 OHingeStatus ODevice::readHingeSensor ( )
 {
-        return CASE_UNKNOWN;
+    VirtHingeStatus hing;
+    virtual_hook( VIRTUAL_HINGE, &hing );
+    return hing.hingeStat;
 }
 
 /**
  * @return a list with CPU frequencies supported by the hardware
  */
 const QStrList &ODevice::allowedCpuFrequencies ( ) const
 {
         return *d->m_cpu_frequencies;
 }
 
 
 /**
@@ -994,26 +1007,47 @@ void ODevice::remapHeldAction ( int button, const OQCopMessage &action )
         ODeviceButton &b = ( *d-> m_buttons ) [button];
             b. setHeldAction ( action );
 
         Config buttonFile ( "ButtonSettings" );
         buttonFile. setGroup ( "Button" + QString::number ( button ));
         buttonFile. writeEntry ( "HeldActionChannel", (const char *) b. heldAction ( ). channel ( ));
         buttonFile. writeEntry ( "HeldActionMessage", (const char *) b. heldAction ( ). message ( ));
 
         //buttonFile. writeEntry ( "HeldActionArgs", decodeBase64 ( b. heldAction ( ). data ( )));
 
         QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" );
 }
-void ODevice::virtual_hook(int, void* ){
-
+void ODevice::virtual_hook(int id, void* data){
+    switch( id ) {
+    case VIRTUAL_ROTATION:{
+        VirtRotation* rot = reinterpret_cast<VirtRotation*>( data );
+        rot->trans = d->m_rotation;
+        break;
+    }
+    case VIRTUAL_DIRECTION:{
+        VirtDirection *dir = reinterpret_cast<VirtDirection*>( data );
+        dir->direct = d->m_direction;
+        break;
+    }
+    case VIRTUAL_HAS_HINGE:{
+        VirtHasHinge *hin = reinterpret_cast<VirtHasHinge*>( data );
+        hin->hasHinge = false;
+        break;
+    }
+    case VIRTUAL_HINGE:{
+        VirtHingeStatus *hin = reinterpret_cast<VirtHingeStatus*>( data );
+        hin->hingeStat = CASE_UNKNOWN;
+        break;
+    }
+    }
 }
 
 /**************************************************
  *
  * Yopy 3500/3700
  *
  **************************************************/
 
 bool Yopy::isYopy ( )
 {
   QFile f( "/proc/cpuinfo" );
   if ( f. open ( IO_ReadOnly ) ) {
@@ -1031,71 +1065,71 @@ bool Yopy::isYopy ( )
     }
   }
   return false;
 }
 
 void Yopy::init ( )
 {
   d-> m_vendorstr = "G.Mate";
   d-> m_vendor = Vendor_GMate;
   d-> m_modelstr = "Yopy3700";
   d-> m_model = Model_Yopy_3700;
   d-> m_rotation = Rot0;
-  
+
   d-> m_systemstr = "Linupy";
   d-> m_system = System_Linupy;
-  
+
   QFile f ( "/etc/issue" );
   if ( f. open ( IO_ReadOnly )) {
     QTextStream ts ( &f );
     ts.readLine();
     d-> m_sysverstr = ts. readLine ( );
     f. close ( );
   }
 }
 
 void Yopy::initButtons ( )
 {
   if ( d-> m_buttons )
     return;
 
   d-> m_buttons = new QValueList <ODeviceButton>;
 
   for (uint i = 0; i < ( sizeof( yopy_buttons ) / sizeof(yopy_button)); i++) {
 
     yopy_button *ib = yopy_buttons + i;
-    
+
     ODeviceButton b;
 
     b. setKeycode ( ib-> code );
     b. setUserText ( QObject::tr ( "Button", ib-> utext ));
     b. setPixmap ( Resource::loadPixmap ( ib-> pix ));
     b. setFactoryPresetPressedAction
       (OQCopMessage(makeChannel(ib->fpressedservice), ib->fpressedaction));
     b. setFactoryPresetHeldAction
       (OQCopMessage(makeChannel(ib->fheldservice), ib->fheldaction));
 
     d-> m_buttons-> append ( b );
   }
   reloadButtonMapping ( );
-  
+
   QCopChannel *sysch = new QCopChannel("QPE/System", this);
-  connect(sysch, SIGNAL(received(const QCString &, const QByteArray & )), 
+  connect(sysch, SIGNAL(received(const QCString &, const QByteArray & )),
           this, SLOT(systemMessage(const QCString &, const QByteArray & )));
 }
 
 bool Yopy::suspend()
 {
-  /* Opie for Yopy does not implement its own power management at the 
-     moment.  The public version runs parallel to X, and relies on the 
+  /* Opie for Yopy does not implement its own power management at the
+     moment.  The public version runs parallel to X, and relies on the
      existing power management features. */
   return false;
 }
 
 bool Yopy::setDisplayBrightness(int bright)
 {
   /* The code here works, but is disabled as the current version runs
      parallel to X, and relies on the existing backlight demon. */
 #if 0
   if ( QFile::exists("/proc/sys/pm/light") ) {
     int fd = ::open("/proc/sys/pm/light", O_WRONLY);
     if (fd >= 0 ) {
@@ -1534,25 +1568,25 @@ int iPAQ::lightSensorResolution ( ) const
 //       Only question right now is: Do we really need to do it? Because as soon
 //       as the OpenZaurus kernel is ready, there will be a unified interface for all
 //       Zaurus models (concerning apm, backlight, buttons, etc.)
 //
 //       Comments? - mickeyl.
 
 bool Zaurus::isZaurus()
 {
 
         // If the special devices by embedix exist, it is quite simple: it is a Zaurus !
         if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ) ){
                 return true;
-                }
+        }
 
         // On non-embedix kernels, we have to look closer.
         bool is_zaurus = false;
         QFile f ( "/proc/cpuinfo" );
         if ( f. open ( IO_ReadOnly ) ) {
                 QString model;
                 QFile f ( "/proc/cpuinfo" );
 
                 QTextStream ts ( &f );
                 QString line;
                 while( line = ts. readLine ( ) ) {
                         if ( line. left ( 8 ) == "Hardware" )
@@ -1812,25 +1846,25 @@ void Zaurus::buzzer ( int sound )
                 }
         }
 
         // If a soundname is defined, we expect that this device has
         // sound capabilities.. Otherwise we expect to have the buzzer
         // device..
         if ( !soundname.isEmpty() ){
                 int fd;
                 int vol;
                 bool vol_reset = false;
 
                 Sound snd ( soundname );
-                
+
                 if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) {
                         if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
                                 Config cfg ( "qpe" );
                                 cfg. setGroup ( "Volume" );
 
                                 int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
                                 if ( volalarm < 0 )
                                         volalarm = 0;
                                 else if ( volalarm > 100 )
                                         volalarm = 100;
                                 volalarm |= ( volalarm << 8 );
 
@@ -1839,33 +1873,33 @@ void Zaurus::buzzer ( int sound )
                         }
                 }
 
                 snd. play ( );
                 while ( !snd. isFinished ( ))
                         qApp-> processEvents ( );
 
                 if ( fd >= 0 ) {
                         if ( vol_reset )
                                 ::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
                         ::close ( fd );
                 }
-                } else {        
+        } else {
                 int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
-                
+
                 if ( fd >= 0 ) {
                         ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
                         ::close ( fd );
                 }
 
-        } 
+        }
 #endif
 }
 
 
 void Zaurus::alarmSound ( )
 {
         buzzer ( SHARP_BUZ_SCHEDULE_ALARM );
 }
 
 void Zaurus::touchSound ( )
 {
         buzzer ( SHARP_BUZ_TOUCHSOUND );
@@ -2057,27 +2091,27 @@ Transformation Zaurus::rotation ( ) const
         int handle = 0;
         int retval = 0;
 
         switch ( d-> m_model ) {
                 case Model_Zaurus_SLC7x0:
                         handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK);
                         if (handle == -1) {
                                 return Rot270;
                         } else {
                                 retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION);
                                 ::close (handle);
 
-                                if (retval == 2 ) 
+                                if (retval == 2 )
                                         rot = Rot0;
-                                else 
+                                else
                                         rot = Rot270;
                         }
                         break;
                 case Model_Zaurus_SLA300:
                 case Model_Zaurus_SLB600:
                 case Model_Zaurus_SL5500:
                 case Model_Zaurus_SL5000:
                 default:
                         rot = d-> m_rotation;
                         break;
         }
 
@@ -2144,24 +2178,52 @@ OHingeStatus Zaurus::readHingeSensor()
             qDebug( "Zaurus::readHingeSensor() - result = %d", retval );
             return static_cast<OHingeStatus>( retval );
         }
         else
         {
             qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" );
             return CASE_UNKNOWN;
         }
     }
 }
 
 
+void Zaurus::virtual_hook( int id, void *data ) {
+    switch( id ) {
+    case VIRTUAL_ROTATION:{
+        VirtRotation* rot = reinterpret_cast<VirtRotation*>( data );
+        rot->trans = rotation();
+        break;
+    }
+    case VIRTUAL_DIRECTION:{
+        VirtDirection *dir = reinterpret_cast<VirtDirection*>( data );
+        dir->direct = direction();
+        break;
+    }
+    case VIRTUAL_HAS_HINGE:{
+        VirtHasHinge *hin = reinterpret_cast<VirtHasHinge*>( data );
+        hin->hasHinge = hasHingeSensor();
+        break;
+    }
+    case VIRTUAL_HINGE:{
+        VirtHingeStatus *hin = reinterpret_cast<VirtHingeStatus*>( data );
+        hin->hingeStat = readHingeSensor();
+        break;
+    }
+    default:
+        ODevice::virtual_hook( id, data );
+        break;
+    }
+}
+
 /**************************************************
  *
  * SIMpad
  *
  **************************************************/
 
 void SIMpad::init ( )
 {
         d-> m_vendorstr = "SIEMENS";
         d-> m_vendor = Vendor_SIEMENS;
 
         QFile f ( "/proc/hal/model" );
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 791d358..fc41079 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -185,26 +185,26 @@ public:
         QString modelString ( ) const;
         OModel model ( ) const;
         inline OModel series ( ) const { return (OModel) ( model ( ) & Model_Series_Mask ); }
 
         QString vendorString ( ) const;
         OVendor vendor ( ) const;
 
         QString systemString ( ) const;
         OSystem system ( ) const;
 
         QString systemVersionString ( ) const;
 
-        virtual Transformation rotation ( ) const;
-        virtual ODirection direction ( ) const;
+    /*virtual*/ Transformation rotation ( ) const;
+    /*virtual*/ ODirection direction ( ) const;
 
 // system
 
         virtual bool setSoftSuspend ( bool on );
         virtual bool suspend ( );
 
         virtual bool setDisplayStatus ( bool on );
         virtual bool setDisplayBrightness ( int brightness );
         virtual int displayBrightnessResolution ( ) const;
         virtual bool setDisplayContrast ( int contrast );
         virtual int displayContrastResolution ( ) const;
 
@@ -220,26 +220,26 @@ public:
         virtual void keySound ( );
         virtual void touchSound ( );
 
         virtual QValueList <OLed> ledList ( ) const;
         virtual QValueList <OLedState> ledStateList ( OLed led ) const;
         virtual OLedState ledState ( OLed led ) const;
         virtual bool setLedState ( OLed led, OLedState st );
 
         virtual bool hasLightSensor ( ) const;
         virtual int readLightSensor ( );
         virtual int lightSensorResolution ( ) const;
 
-        virtual bool hasHingeSensor ( ) const;
-        virtual OHingeStatus readHingeSensor ( );
+    /*virtual*/ bool hasHingeSensor ( ) const;
+    /*virtual*/ OHingeStatus readHingeSensor ( );
 
         const QStrList &allowedCpuFrequencies() const;
         bool setCurrentCpuFrequency(uint index);
 
         /**
          * Returns the available buttons on this device.  The number and location
          * of buttons will vary depending on the device.  Button numbers will be assigned
          * by the device manufacturer and will be from most preferred button to least preffered
          * button.  Note that this list only contains "user mappable" buttons.
          *
          * @todo ### make const
          */
@@ -269,18 +269,34 @@ public:
         uint buttonHoldTime ( ) const;
 
 signals:
         void buttonMappingChanged ( );
 
 private slots:
         void systemMessage ( const QCString &, const QByteArray & );
 
 protected:
         void reloadButtonMapping ( );
         /*  ugly virtual hook */
         virtual void virtual_hook( int id, void* data );
+
+protected:
+    enum { VIRTUAL_ROTATION = 0x200, VIRTUAL_DIRECTION,
+           VIRTUAL_HAS_HINGE, VIRTUAL_HINGE };
+    struct VirtRotation {
+        Transformation trans;
+    };
+    struct VirtDirection {
+        ODirection direct;
+    };
+    struct VirtHasHinge {
+        bool hasHinge;
+    };
+    struct VirtHingeStatus {
+        OHingeStatus hingeStat;
+    };
 };
 
 }
 
 #endif