improve ipaq 2200, 4xxx, 4700 support. patches courtesy R.Wagner, E.Hovland, P.Sokolovsky. thanks guys

2 files changed, 42 insertions, 6 deletions

diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index c2fa411..a8362cd 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -72,4 +72,5 @@ enum OModel {
     Model_iPAQ_H1940    = ( Model_iPAQ | 0x0009 ),
     Model_iPAQ_HX4700   = ( Model_iPAQ | 0x000A ),
+    Model_iPAQ_H4xxx    = ( Model_iPAQ | 0x000b ),
     Model_Jornada       = ( 6 << 16 ),
     Model_Jornada_56x   = ( Model_Jornada | 0x0001 ),
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 63b60a7..00939bf 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -86,10 +86,10 @@ typedef struct {
 
 struct i_button ipaq_buttons [] = {
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
+    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx,
     Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
     "devicebuttons/ipaq_calendar",
     "datebook", "nextView()",
     "today", "raise()" },
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
+    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx,
     Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
     "devicebuttons/ipaq_contact",
@@ -106,5 +106,5 @@ struct i_button ipaq_buttons [] = {
     "opiemail", "raise()",
     "opiemail", "newMail()" },
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x,
+    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H4xxx,
     Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
     "devicebuttons/ipaq_home",
@@ -117,10 +117,10 @@ struct i_button ipaq_buttons [] = {
     "sound", "raise()" },
 
-    { Model_iPAQ_H191x,
+    { Model_iPAQ_H191x | Model_iPAQ_H4xxx,
     Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"),
     "devicebuttons/ipaq_mail",
     "opiemail", "raise()",
     "opiemail", "newMail()" },
-    { Model_iPAQ_H191x,
+    { Model_iPAQ_H191x | Model_iPAQ_H4xxx,
     Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"),
     "devicebuttons/ipaq_record",
@@ -128,4 +128,32 @@ struct i_button ipaq_buttons [] = {
     "sound", "raise()" },
 
+    //h2200 has different button mapping
+    { Model_iPAQ_H22xx,
+    Qt::Key_NumLock, QT_TRANSLATE_NOOP("Button", "Mail Button"),
+    "devicebuttons/ipaq_mail",
+    "opiemail", "raise()",
+    "opiemail", "newMail()" },
+    { Model_iPAQ_H22xx,
+    Qt::Key_ScrollLock, QT_TRANSLATE_NOOP("Button", "Menu Button"),
+    "devicebuttons/ipaq_menu",
+    "QPE/TaskBar", "toggleMenu()",
+    "QPE/TaskBar", "toggleStartMenu()" },
+    // and hx4700 has different button mapping still
+    { Model_iPAQ_HX4700,
+    Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"),
+    "devicebuttons/ipaq_mail",
+    "opiemail", "raise()",
+    "opiemail", "newMail()" },
+    { Model_iPAQ_HX4700,
+    Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Record Button"),
+    "devicebuttons/ipaq_record",
+    "QPE/VMemo", "toggleRecord()",
+    "sound", "raise()" },
+    { Model_iPAQ_HX4700,
+    Qt::Key_Home, QT_TRANSLATE_NOOP("Button", "Home Button"),
+    "devicebuttons/ipaq_home",
+    "QPE/Launcher", "home()",
+    "buttonsettings", "raise()" },
+
 };
 
@@ -157,4 +185,6 @@ void iPAQ::init(const QString& model)
     else if ( d->m_modelstr == "HX4700" )
         d->m_model = Model_iPAQ_HX4700;
+    else if ( d->m_modelstr == "H4000" )
+        d->m_model = Model_iPAQ_H4xxx;
 
     else
@@ -171,4 +201,5 @@ void iPAQ::init(const QString& model)
         case Model_iPAQ_H1940:
         case Model_iPAQ_HX4700:
+        case Model_iPAQ_H4xxx:
             d->m_rotation = Rot0;
             break;
@@ -310,4 +341,5 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
             if (( d->m_model == Model_iPAQ_H5xxx ) ||
                 ( d->m_model == Model_iPAQ_H191x ) ||
+                ( d->m_model == Model_iPAQ_H4xxx ) ||
                 ( d->m_model == Model_iPAQ_H1940 ))
                 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
@@ -317,5 +349,5 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
         // map Power Button short/long press to F6 for h191x
         case Key_F6:
-            if ( d->m_model != Model_iPAQ_H191x )
+            if ( d->m_model != Model_iPAQ_H191x && d->m_model != Model_iPAQ_H4xxx )
                 break;
         // map Power Button short/long press to F34/F35
@@ -381,4 +413,5 @@ bool iPAQ::setDisplayBrightness ( int bright )
     switch ( model()) {
     case Model_iPAQ_H191x:
+    case Model_iPAQ_H4xxx:
         {
             QDir sysClass( "/sys/class/backlight/pxafb/" );
@@ -440,4 +473,5 @@ int iPAQ::displayBrightnessResolution() const
         case Model_iPAQ_H5xxx:
         case Model_iPAQ_HX4700:
+        case Model_iPAQ_H4xxx:
             return 255;
         case Model_iPAQ_H191x:
@@ -484,4 +518,5 @@ bool iPAQ::hasLightSensor() const
     switch (model()) {
         case Model_iPAQ_H191x:
+        case Model_iPAQ_H4xxx:
             return false;
         default: