add iPAQ H5xxx support

2 files changed, 17 insertions, 9 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 13b4330..3edf8e7 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -108,9 +108,9 @@ protected:
 
 class Jornada : public ODevice {
 protected:
 	virtual void init ( );
-	virtual void initButtons ( );
+	//virtual void initButtons ( );
 public:
 	virtual bool setSoftSuspend ( bool soft );
 	virtual bool setDisplayBrightness ( int b );
 	virtual int displayBrightnessResolution ( ) const;
@@ -206,14 +206,14 @@ struct i_button {
 	char *fpressedaction;
 	char *fheldservice;
 	char *fheldaction;
 } ipaq_buttons [] = {
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx,
+    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
     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_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
     Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
 	"devicebuttons/ipaq_contact",
 	"addressbook", "raise()",
 	"addressbook", "beamBusinessCard()" },
@@ -221,19 +221,19 @@ struct i_button {
     Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
 	"devicebuttons/ipaq_menu",
  	"QPE/TaskBar", "toggleMenu()",
 	"QPE/TaskBar", "toggleStartMenu()" },
-    { Model_iPAQ_H38xx | Model_iPAQ_H39xx,
+    { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
     Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
 	"devicebuttons/ipaq_mail",
 	"mail", "raise()",
 	"mail", "newMail()" },
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx,
+    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
     Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
 	"devicebuttons/ipaq_home",
 	"QPE/Launcher", "home()",
 	"buttonsettings", "raise()" },
-    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx,
+    { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
     Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"),
 	"devicebuttons/ipaq_record",
 	"QPE/VMemo", "toggleRecord()",
 	"sound", "raise()" },
@@ -1117,8 +1117,10 @@ void iPAQ::init ( )
 		else if ( d-> m_modelstr == "H3800" )
 			d-> m_model = Model_iPAQ_H38xx;
 		else if ( d-> m_modelstr == "H3900" )
 			d-> m_model = Model_iPAQ_H39xx;
+		else if ( d-> m_modelstr == "H5400" )
+			d-> m_model = Model_iPAQ_H5xxx;
 		else
 			d-> m_model = Model_Unknown;
 
 		f. close ( );
@@ -1134,8 +1136,10 @@ void iPAQ::init ( )
 		case Model_iPAQ_H39xx:
 		default:
 			d-> m_rotation = Rot270;
 			break;
+		case Model_iPAQ_H5xxx:
+			d-> m_rotation = Rot0;
 	}
 
 	f. setName ( "/etc/familiar-version" );
 	if ( f. open ( IO_ReadOnly )) {
@@ -1291,9 +1295,10 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
 	switch ( keycode ) {
 		// H38xx/H39xx have no "Q" key anymore - this is now the Mail key
 		case HardKey_Menu: {
 			if (( d-> m_model == Model_iPAQ_H38xx ) ||
-			    ( d-> m_model == Model_iPAQ_H39xx )) {
+			    ( d-> m_model == Model_iPAQ_H39xx ) ||
+			    ( d-> m_model == Model_iPAQ_H5xxx)) {
 				newkeycode = HardKey_Mail;
 			}
 			break;
 		}
@@ -1435,8 +1440,10 @@ int iPAQ::displayBrightnessResolution ( ) const
 
 		case Model_iPAQ_H38xx:
 		case Model_iPAQ_H39xx:
 			return 64;
+		case Model_iPAQ_H5xxx:
+			return 255;
 
 		default:
 			return 2;
 	}
@@ -2515,9 +2522,9 @@ void Jornada::init ( )
 		f. close ( );
 	}
 }
 
-
+#if 0
 void Jornada::initButtons ( )
 {
 	if ( d-> m_buttons )
 		return;
@@ -2544,9 +2551,9 @@ void Jornada::initButtons ( )
 
 	QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
 	connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
 }
-
+#endif
 int Jornada::displayBrightnessResolution ( ) const
 {
 }
 
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 35e3eff..46f1614 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -49,8 +49,9 @@ enum OModel {
 	Model_iPAQ_H36xx    = ( Model_iPAQ | 0x000002 ),
 	Model_iPAQ_H37xx    = ( Model_iPAQ | 0x000004 ),
 	Model_iPAQ_H38xx    = ( Model_iPAQ | 0x000008 ),
 	Model_iPAQ_H39xx    = ( Model_iPAQ | 0x000010 ),
+	Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x000011 ),
 
 	Model_Jornada       = ( 6 << 24 ),
 	Model_Jornada_56x   = ( Model_Jornada | 0x000001 ),