-rw-r--r-- | libopie/odevice.cpp | 9 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 35d6cb4..c5a916b 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -1330,15 +1330,22 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b | |||
1330 | break; | 1330 | break; |
1331 | } | 1331 | } |
1332 | 1332 | ||
1333 | // Rotate cursor keys 180° | 1333 | // Rotate cursor keys 180° or 270° |
1334 | case Key_Left : | 1334 | case Key_Left : |
1335 | case Key_Right: | 1335 | case Key_Right: |
1336 | case Key_Up : | 1336 | case Key_Up : |
1337 | case Key_Down : { | 1337 | case Key_Down : { |
1338 | |||
1338 | if (( d-> m_model == Model_iPAQ_H31xx ) || | 1339 | if (( d-> m_model == Model_iPAQ_H31xx ) || |
1339 | ( d-> m_model == Model_iPAQ_H38xx )) { | 1340 | ( d-> m_model == Model_iPAQ_H38xx )) { |
1340 | newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; | 1341 | newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; |
1341 | } | 1342 | } |
1343 | // Rotate the cursor keys by 270° | ||
1344 | // keycode - Key_Left = position of the button starting from left clockwise | ||
1345 | // add the rotation to it and modolo. No we've the original offset | ||
1346 | // add the offset to the Key_Left key | ||
1347 | if ( d-> m_model == Model_iPAQ_H5xxx ) | ||
1348 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; | ||
1342 | break; | 1349 | break; |
1343 | } | 1350 | } |
1344 | 1351 | ||
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index d20ea4d..cc4b01a 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp | |||
@@ -294,7 +294,7 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b | |||
294 | break; | 294 | break; |
295 | } | 295 | } |
296 | 296 | ||
297 | // Rotate cursor keys 180° | 297 | // Rotate cursor keys 180° or 270° |
298 | case Key_Left : | 298 | case Key_Left : |
299 | case Key_Right: | 299 | case Key_Right: |
300 | case Key_Up : | 300 | case Key_Up : |
@@ -303,6 +303,12 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b | |||
303 | ( d->m_model == Model_iPAQ_H38xx )) { | 303 | ( d->m_model == Model_iPAQ_H38xx )) { |
304 | newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; | 304 | newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4; |
305 | } | 305 | } |
306 | // Rotate the cursor keys by 270° | ||
307 | // keycode - Key_Left = position of the button starting from left clockwise | ||
308 | // add the rotation to it and modolo. No we've the original offset | ||
309 | // add the offset to the Key_Left key | ||
310 | if ( d-> m_model == Model_iPAQ_H5xxx ) | ||
311 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; | ||
306 | break; | 312 | break; |
307 | } | 313 | } |
308 | 314 | ||