summaryrefslogtreecommitdiff
authorerik <erik>2007-02-21 16:59:03 (UTC)
committer erik <erik>2007-02-21 16:59:03 (UTC)
commit6b0fa616c4aac654c549621eb0009ab3eb32fe34 (patch) (side-by-side diff)
treeb5a592194a9cbf3b02b38b0d2e412201beb5b49c
parent45f2e4cdc6e185439ef4bde6e2b8181a4decd032 (diff)
downloadopie-6b0fa616c4aac654c549621eb0009ab3eb32fe34.zip
opie-6b0fa616c4aac654c549621eb0009ab3eb32fe34.tar.gz
opie-6b0fa616c4aac654c549621eb0009ab3eb32fe34.tar.bz2
This commit fixes Opie bug 1839:
http://opie-bugs.oszine.de/view.php?id=1839
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp22
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
@@ -319,3 +319,4 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
- // 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 :
@@ -324,15 +325,10 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
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;