summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog2
-rw-r--r--libopie2/opiecore/device/odevice.h1
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp47
3 files changed, 43 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d0bbcb9..64bf7a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,9 @@
------------
Fixed Bugs
----------
- * 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)
Internal
--------
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
@@ -70,8 +70,9 @@ enum OModel {
Model_iPAQ_H22xx = ( Model_iPAQ | 0x0007 ),
Model_iPAQ_H191x = ( Model_iPAQ | 0x0008 ),
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 ),
Model_Jornada_720 = ( Model_Jornada | 0x0002 ),
Model_Jornada_820 = ( Model_Jornada | 0x0003 ),
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
@@ -84,14 +84,14 @@ typedef struct {
#define LED_ON OD_IOW( 'f', 5, LED_IN )
#define FLITE_ON OD_IOW( 'f', 7, FLITE_IN )
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",
"addressbook", "raise()",
"addressbook", "beamBusinessCard()" },
@@ -104,9 +104,9 @@ struct i_button ipaq_buttons [] = {
Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
"devicebuttons/ipaq_mail",
"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",
"QPE/Launcher", "home()",
"buttonsettings", "raise()" },
@@ -115,19 +115,47 @@ struct i_button ipaq_buttons [] = {
"devicebuttons/ipaq_record",
"QPE/VMemo", "toggleRecord()",
"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",
"QPE/VMemo", "toggleRecord()",
"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()" },
+
};
void iPAQ::init(const QString& model)
{
@@ -155,8 +183,10 @@ void iPAQ::init(const QString& model)
else if ( d->m_modelstr == "H1940" )
d->m_model = Model_iPAQ_H1940;
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
d->m_model = Model_Unknown;
@@ -169,8 +199,9 @@ void iPAQ::init(const QString& model)
case Model_iPAQ_H22xx:
case Model_iPAQ_H191x:
case Model_iPAQ_H1940:
case Model_iPAQ_HX4700:
+ case Model_iPAQ_H4xxx:
d->m_rotation = Rot0;
break;
case Model_iPAQ_H36xx:
case Model_iPAQ_H37xx:
@@ -308,16 +339,17 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
// add the rotation to it and modolo. No we've the original offset
// add the offset to the Key_Left key
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;
break;
}
// 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
case Key_SysReq: {
if ( isPress ) {
@@ -379,8 +411,9 @@ bool iPAQ::setDisplayBrightness ( int bright )
QString cmdline;
switch ( model()) {
case Model_iPAQ_H191x:
+ case Model_iPAQ_H4xxx:
{
QDir sysClass( "/sys/class/backlight/pxafb/" );
sysClass.setFilter(QDir::Dirs);
int fd;
@@ -438,8 +471,9 @@ int iPAQ::displayBrightnessResolution() const
case Model_iPAQ_H39xx:
return 64;
case Model_iPAQ_H5xxx:
case Model_iPAQ_HX4700:
+ case Model_iPAQ_H4xxx:
return 255;
case Model_iPAQ_H191x:
return 7;
case Model_iPAQ_H1940:
@@ -482,8 +516,9 @@ bool iPAQ::setDisplayStatus ( bool on )
bool iPAQ::hasLightSensor() const
{
switch (model()) {
case Model_iPAQ_H191x:
+ case Model_iPAQ_H4xxx:
return false;
default:
return true;
}