Add SL-C700 button handling, so we can handle the keycode for the physical screen rotation.

1 files changed, 42 insertions, 3 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 713cc90..cb7dd74 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -30,24 +30,27 @@
 
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qpe/sound.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include "odevice.h"
 
 #include <qwindowsystem_qws.h>
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
 
 // _IO and friends are only defined in kernel headers ...
 
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
 
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
 
 using namespace Opie;
 
@@ -196,24 +199,47 @@ struct z_button {
         "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", "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"),
+        "",
+        "QPE/Rotation", "flip()",
+        "QPE/Rotation", "flip()" },
+};
+
 static QCString makeChannel ( const char *str )
 {
         if ( str && !::strchr ( str, '/' ))
                 return QCString ( "QPE/Application/" ) + str;
         else
                 return str;
 }
 
 
 
 
 ODevice *ODevice::inst ( )
@@ -1132,30 +1158,30 @@ void Zaurus::init ( )
                 else if ( model == "SL-A300" )
                         d-> m_model = Model_Zaurus_SLA300;
                 else if ( model == "SL-B600" || model == "SL-5600" )
                         d-> m_model = Model_Zaurus_SLB600;
                 else
                         d-> m_model = Model_Zaurus_SL5000;
         }
         else {
                 d-> m_model = Model_Zaurus_SL5000;
                 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_SLC700:
-                        bool flipstate = false;
                         // 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.
                         if ( flipstate ) {
                                 // 480x640
                                 d-> m_rotation = Rot0;
                                 d-> m_direction = CW;
                         } else {
                                 // 640x480
                                 d-> m_rotation = Rot270;
                                 d-> m_direction = CCW;
@@ -1171,26 +1197,39 @@ void Zaurus::init ( )
         m_leds [0] = Led_Off;
 }
 
 void Zaurus::initButtons ( )
 {
         if ( d-> m_buttons )
                 return;
 
         d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false;
 
         d-> m_buttons = new QValueList <ODeviceButton>;
 
-        for ( uint i = 0; i < ( sizeof( z_buttons ) / sizeof( z_button )); i++ ) {
-                z_button *zb = z_buttons + i;
+        struct z_button * pz_buttons;
+        int buttoncount;
+        switch ( d-> m_model ) {
+                case Model_Zaurus_SLC700:
+                        pz_buttons = z_buttons_c700;
+                        buttoncount = ARRAY_SIZE(z_buttons_c700);
+                        break;
+                default:
+                        pz_buttons = z_buttons;
+                        buttoncount = ARRAY_SIZE(z_buttons);
+                        break;
+        }
+
+        for ( int i = 0; i < buttoncount; i++ ) {
+                struct z_button *zb = pz_buttons + i;
                 ODeviceButton b;
 
                 b. setKeycode ( zb-> code );
                 b. setUserText ( QObject::tr ( "Button", zb-> utext ));
                 b. setPixmap ( Resource::loadPixmap ( zb-> pix ));
                 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), zb-> fpressedaction ));
                 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), zb-> fheldaction ));
 
                 d-> m_buttons-> append ( b );
         }
 
         reloadButtonMapping ( );