2 files changed, 109 insertions, 19 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 9373ef9..5038cc9 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -120,48 +120,53 @@ public:
 
 };
 
 class Zaurus : public ODevice {
 protected:
         virtual void init ( );
         virtual void initButtons ( );
 
 public:
         virtual bool setSoftSuspend ( bool soft );
 
         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 );
 
         static bool isZaurus();
+        
+        // Does this break BC? 
+        virtual bool suspend ( );
+        virtual Transformation rotation ( ) const;
+        virtual ODirection direction ( ) const;
 
 protected:
         virtual void buzzer ( int snd );
 
         OLedState m_leds [1];
         bool m_embedix;
 };
 
 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 );
         virtual bool setDisplayBrightness ( int b );
         virtual int displayBrightnessResolution ( ) const;
 
         virtual void alarmSound ( );
 
         virtual QValueList <OLed> ledList ( ) const;
@@ -268,52 +273,52 @@ struct z_button {
         "QPE/TaskBar", "toggleStartMenu()" },
     { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
         "devicebuttons/z_mail",
         "mail", "raise()",
         "mail", "newMail()" },
 };
 
 struct z_button z_buttons_c700 [] = {
     { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
         "devicebuttons/z_calendar",
         "datebook", "nextView()",
         "today", "raise()" },
     { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
         "devicebuttons/z_contact",
         "addressbook", "raise()",
         "addressbook", "beamBusinessCard()" },
     { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
         "devicebuttons/z_home",
         "QPE/Launcher", "home()",
         "buttonsettings", "raise()" },
     { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
         "devicebuttons/z_menu",
          "QPE/TaskBar", "toggleMenu()",
         "QPE/TaskBar", "toggleStartMenu()" },
-    { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Display Rotate"),
+    { Qt::Key_F14, QT_TRANSLATE_NOOP("Button", "Display Rotate"),
         "",
-        "QPE/Rotation", "flip()",
-        "QPE/Rotation", "flip()" },
+        "QPE/Rotation", "rotateDefault()",
+        "QPE/Rotation", "rotateDefault()" },
 };
 
 struct s_button {
     uint model;
     Qt::Key code;
     char *utext;
     char *pix;
     char *fpressedservice;
     char *fpressedaction;
     char *fheldservice;
     char *fheldaction;
 } simpad_buttons [] = {
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
     Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"),
     "devicebuttons/simpad_lower_up",
     "datebook", "nextView()",
     "today", "raise()" },
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
     Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"),
     "devicebuttons/simpad_lower_down",
     "addressbook", "raise()",
     "addressbook", "beamBusinessCard()" },
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
     Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"),
@@ -1611,62 +1616,50 @@ void Zaurus::init ( )
                 d-> m_modelstr = "Zaurus SL-C700";
         } else if ( model == "SHARP Shepherd" ) {
                 d-> m_model = Model_Zaurus_SLC7x0;
                 d-> m_modelstr = "Zaurus SL-C750";
         } else if ( model == "SHARP Husky" ) {
                 d-> m_model = Model_Zaurus_SLC7x0;
                 d-> m_modelstr = "Zaurus SL-C760";
         } else if ( model == "SHARP Poodle" ) {
                 d-> m_model = Model_Zaurus_SLB600;
                 d-> m_modelstr = "Zaurus SL-B500 or SL-5600";
         } else if ( model == "Sharp-Collie" || model == "Collie" ) {
                 d-> m_model = Model_Zaurus_SL5500;
                 d-> m_modelstr = "Zaurus SL-5500 or SL-5000d";
         } else {
                 d-> m_model = Model_Zaurus_SL5500;
                 d-> m_modelstr = "Zaurus (Model unknown)";
         }
 
         bool flipstate = false;
         switch ( d-> m_model ) {
                 case Model_Zaurus_SLA300:
                         d-> m_rotation = Rot0;
                         break;
                 case Model_Zaurus_SLC7x0:
-                        // Note: need to 1) set flipstate based on physical screen orientation
-                        // and 2) check to see if the user overrode the rotation direction
-                        // using appearance, and if so, remove that item from the Config to
-                        // ensure the rotate applet flips us back to the previous state.
-                        // treke said he has patches for detecting the phys. so where are they, treke? -mickeyl.
-                        if ( flipstate ) {
-                                // 480x640
-                                d-> m_rotation = Rot0;
-                                d-> m_direction = CW;
-                        } else {
-                                // 640x480
-                                d-> m_rotation = Rot270;
-                                d-> m_direction = CCW;
-                        }
+                        d-> m_rotation = rotation();
+                        d-> m_direction = direction();
                         break;
                 case Model_Zaurus_SLB600:
                 case Model_Zaurus_SL5500:
                 case Model_Zaurus_SL5000:
                 default:
                         d-> m_rotation = Rot270;
                         break;
         }
         m_leds [0] = Led_Off;
 }
 
 void Zaurus::initButtons ( )
 {
         if ( d-> m_buttons )
                 return;
 
         d-> m_buttons = new QValueList <ODeviceButton>;
 
         struct z_button * pz_buttons;
         int buttoncount;
         switch ( d-> m_model ) {
                 case Model_Zaurus_SLC7x0:
                         pz_buttons = z_buttons_c700;
                         buttoncount = ARRAY_SIZE(z_buttons_c700);
@@ -1725,48 +1718,50 @@ void Zaurus::initButtons ( )
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
 
 //#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 //#define SHARP_BUZ_KEYSOUND         2  /* key sound */
 
 //#define SHARP_PDA_ILLCLICKSOUND    3  /* illegal click */
 //#define SHARP_PDA_WARNSOUND        4  /* warning occurred */
 //#define SHARP_PDA_ERRORSOUND       5  /* error occurred */
 //#define SHARP_PDA_CRITICALSOUND    6  /* critical error occurred */
 //#define SHARP_PDA_SYSSTARTSOUND    7  /* system start */
 //#define SHARP_PDA_SYSTEMENDSOUND   8  /* system shutdown */
 //#define SHARP_PDA_APPSTART         9  /* application start */
 //#define SHARP_PDA_APPQUIT         10  /* application ends */
 
 //#define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 //#define SHARP_BUZ_DAILY_ALARM     12  /* daily alarm */
 //#define SHARP_BUZ_GOT_PHONE_CALL  13  /* phone call sound */
 //#define SHARP_BUZ_GOT_MAIL        14  /* mail sound */
 //
 
         #defineSHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_LED_SETSTATUS   (SHARP_LED_IOCTL_START+1)
 
+#define  SHARP_IOCTL_GET_ROTATION 0x413c
+
 typedef struct sharp_led_status {
   int which;   /* select which LED status is wanted. */
   int status;  /* set new led status if you call SHARP_LED_SETSTATUS */
 } sharp_led_status;
 
 #define SHARP_LED_MAIL_EXISTS  9       /* mail status (exists or not) */
 
 #define LED_MAIL_NO_UNREAD_MAIL  0   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_NEWMAIL_EXISTS  1   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_UNREAD_MAIL_EX  2   /* for SHARP_LED_MAIL_EXISTS */
 
 // #include <asm/sharp_apm.h> // including kernel headers is evil ...
 
 #define APM_IOCGEVTSRC          OD_IOR( 'A', 203, int )
 #define APM_IOCSEVTSRC          OD_IORW( 'A', 204, int )
 #define APM_EVT_POWER_BUTTON    (1 << 0)
 
 #define FL_IOCTL_STEP_CONTRAST    100
 
 
 void Zaurus::buzzer ( int sound )
 {
 #ifndef QT_NO_SOUND
         QString soundname;
@@ -1958,48 +1953,143 @@ bool Zaurus::setDisplayBrightness ( int bright )
 
         if ( bright > 255 )
                 bright = 255;
         if ( bright < 0 )
                 bright = 0;
 
         if (m_embedix) {
                 if (( fd = ::open ( "/dev/fl", O_WRONLY )) >= 0 ) {
                         int bl = ( bright * 4 + 127 ) / 255; // only 4 steps on zaurus
                         if ( bright && !bl )
                                 bl = 1;
                         res = ( ::ioctl ( fd, FL_IOCTL_STEP_CONTRAST, bl ) == 0 );
                         ::close ( fd );
                 }
         } else {
 #define FB_BACKLIGHT_SET_BRIGHTNESS     _IOW('F', 1, u_int)             /* set brightness */
                 if (( fd = ::open ( "/dev/fb0", O_WRONLY )) >= 0 ) {
                         res = ( ::ioctl ( fd , FB_BACKLIGHT_SET_BRIGHTNESS, bright ) == 0 );
                         ::close ( fd );
                 }
         }
         return res;
 }
 
+bool Zaurus::suspend ( )
+{
+        qDebug("ODevice::suspend");
+        if ( !isQWS( ) ) // only qwsserver is allowed to suspend
+                return false;
+
+        if ( d-> m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
+                return false;
+
+        bool res = false;
+
+        struct timeval tvs, tvn;
+        ::gettimeofday ( &tvs, 0 );
+
+        ::sync ( ); // flush fs caches
+        res = ( ::system ( "apm --suspend" ) == 0 );
+
+        // This is needed because the iPAQ apm implementation is asynchronous and we
+        // can not be sure when exactly the device is really suspended
+        // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists.
+
+        if ( res ) {
+                do { // Yes, wait 15 seconds. This APM bug sucks big time.
+                        ::usleep ( 200 * 1000 );
+                        ::gettimeofday ( &tvn, 0 );
+                } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 15000 );
+        }
+
+        QCopEnvelope ( "QPE/Rotation", "rotateDefault()" );
+        return res;
+}
+
+
+Transformation Zaurus::rotation ( ) const
+{
+        Transformation rot;
+        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 ) 
+                                        rot = Rot0;
+                                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;
+        }
+
+        return rot;
+}
+ODirection Zaurus::direction ( ) const 
+{
+        ODirection dir;
+        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) {
+                                dir = Rot270;
+                        } else {
+                                retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION);
+                                ::close (handle);
+                                if (retval == 2 ) 
+                                        dir = CCW;
+                                else 
+                                        dir = CW;
+                        }
+                        break;
+                case Model_Zaurus_SLA300:
+                case Model_Zaurus_SLB600:
+                case Model_Zaurus_SL5500:
+                case Model_Zaurus_SL5000:
+                default:
+                        dir = d-> m_direction;
+                        break;
+        }
+        return dir;
+
+}
 
 int Zaurus::displayBrightnessResolution ( ) const
 {
         if (m_embedix)
                 return 5;
         else
                 return 256;
 }
 
 /**************************************************
  *
  * SIMpad
  *
  **************************************************/
 
 void SIMpad::init ( )
 {
         d-> m_vendorstr = "SIEMENS";
         d-> m_vendor = Vendor_SIEMENS;
 
         QFile f ( "/proc/hal/model" );
 
     //TODO Implement model checking
     //FIXME For now we assume an SL4
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 25910b5..8273761 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -166,50 +166,50 @@ protected:
         virtual void initButtons ( );
 
         ODeviceData *d;
 
 public:
         // sandman do we want to allow destructions? -zecke?
         virtual ~ODevice ( );
 
         static ODevice *inst ( );
 
         // information
 
         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;
 
-        Transformation rotation ( ) const;
-        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;
 
         // don't add new virtual methods, use this:
                 ///*virtual */ void boo(int i ) { return virtual_hook(1,&i); };
         // and in your subclass do do overwrite
                 //protected virtual int virtual_hook(int, void *)
         // which is defined below
 
 // input / output
         //FIXME playAlarmSound and al might be better -zecke
         virtual void alarmSound ( );
         virtual void keySound ( );
         virtual void touchSound ( );