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

3 files changed, 43 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index d0bbcb9..64bf7a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,3 +8,3 @@
 	----------
-	* n.a.	- Improved iPAQ support in ODevice and low-level applets (Slavek Banko)
+	* n.a.	- Improved iPAQ support in ODevice and low-level applets (S.Banko, R.Wagner, E.Hovland, P.Sokolovsky)
 	* n.a.  - Improved platform support for the Motorola EZX platform (mickeyl)
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
@@ -73,2 +73,3 @@ enum OModel {
     Model_iPAQ_HX4700   = ( Model_iPAQ | 0x000A ),
+    Model_iPAQ_H4xxx    = ( Model_iPAQ | 0x000b ),
     Model_Jornada       = ( 6 << 16 ),
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
@@ -87,3 +87,3 @@ 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"),
@@ -92,3 +92,3 @@ struct i_button ipaq_buttons [] = {
     "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"),
@@ -107,3 +107,3 @@ struct i_button ipaq_buttons [] = {
     "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"),
@@ -118,3 +118,3 @@ struct i_button ipaq_buttons [] = {
 
-    { Model_iPAQ_H191x,
+    { Model_iPAQ_H191x | Model_iPAQ_H4xxx,
     Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"),
@@ -123,3 +123,3 @@ struct i_button ipaq_buttons [] = {
     "opiemail", "newMail()" },
-    { Model_iPAQ_H191x,
+    { Model_iPAQ_H191x | Model_iPAQ_H4xxx,
     Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"),
@@ -129,2 +129,30 @@ struct i_button ipaq_buttons [] = {
 
+    //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()" },
+
 };
@@ -158,2 +186,4 @@ void iPAQ::init(const QString& model)
         d->m_model = Model_iPAQ_HX4700;
+    else if ( d->m_modelstr == "H4000" )
+        d->m_model = Model_iPAQ_H4xxx;
 
@@ -172,2 +202,3 @@ void iPAQ::init(const QString& model)
 	case Model_iPAQ_HX4700:
+	case Model_iPAQ_H4xxx:
             d->m_rotation = Rot0;
@@ -311,2 +342,3 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
 		( d->m_model == Model_iPAQ_H191x ) ||
+		( d->m_model == Model_iPAQ_H4xxx ) ||
 		( d->m_model == Model_iPAQ_H1940 ))
@@ -318,3 +350,3 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
         case Key_F6:
-            if ( d->m_model != Model_iPAQ_H191x )
+            if ( d->m_model != Model_iPAQ_H191x && d->m_model != Model_iPAQ_H4xxx )
                 break;
@@ -382,2 +414,3 @@ bool iPAQ::setDisplayBrightness ( int bright )
     case Model_iPAQ_H191x:
+    case Model_iPAQ_H4xxx:
 	{
@@ -441,2 +474,3 @@ int iPAQ::displayBrightnessResolution() const
 	case Model_iPAQ_HX4700:
+	case Model_iPAQ_H4xxx:
             return 255;
@@ -485,2 +519,3 @@ bool iPAQ::hasLightSensor() const
 	case Model_iPAQ_H191x:
+	case Model_iPAQ_H4xxx:
 	    return false;