| -rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 02b685a..6dc1295 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp @@ -308,42 +308,38 @@ 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_H5xxx)) { newkeycode = HardKey_Mail; } break; } - // Rotate cursor keys 180 or 270 + // QT has strange screen coordinate system, so depending + // on native device screen orientation, we need to rotate cursor keys case Key_Left : case Key_Right: case Key_Up : case Key_Down : { - if (( d->m_model == Model_iPAQ_H31xx ) || - ( d->m_model == Model_iPAQ_H38xx )) { - newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; + int quarters; + switch (d->m_rotation) { + case Rot0: quarters = 3/*270deg*/; break; + case Rot90: quarters = 2/*270deg*/; break; + case Rot180: quarters = 1/*270deg*/; break; + case Rot270: quarters = 0/*270deg*/; break; } - // Rotate the cursor keys by 270 - // keycode - Key_Left = position of the button starting from left clockwise - // 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; + newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; break; } // map Power Button short/long press to F34/F35 case HardKey_Suspend: // Hope we don't have infinite recursion here case Key_SysReq: { if ( isPress ) { if ( m_power_timer ) killTimer ( m_power_timer ); m_power_timer = startTimer ( 500 ); } else if ( m_power_timer ) { |