-rw-r--r-- | libopie/odevice.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 35d6cb4..c5a916b 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -1321,33 +1321,40 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b | |||
1321 | 1321 | ||
1322 | switch ( keycode ) { | 1322 | switch ( keycode ) { |
1323 | // H38xx/H39xx have no "Q" key anymore - this is now the Mail key | 1323 | // H38xx/H39xx have no "Q" key anymore - this is now the Mail key |
1324 | case HardKey_Menu: { | 1324 | case HardKey_Menu: { |
1325 | if (( d-> m_model == Model_iPAQ_H38xx ) || | 1325 | if (( d-> m_model == Model_iPAQ_H38xx ) || |
1326 | ( d-> m_model == Model_iPAQ_H39xx ) || | 1326 | ( d-> m_model == Model_iPAQ_H39xx ) || |
1327 | ( d-> m_model == Model_iPAQ_H5xxx)) { | 1327 | ( d-> m_model == Model_iPAQ_H5xxx)) { |
1328 | newkeycode = HardKey_Mail; | 1328 | newkeycode = HardKey_Mail; |
1329 | } | 1329 | } |
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 | ||
1345 | // map Power Button short/long press to F34/F35 | 1352 | // map Power Button short/long press to F34/F35 |
1346 | case Key_SysReq: { | 1353 | case Key_SysReq: { |
1347 | if ( isPress ) { | 1354 | if ( isPress ) { |
1348 | if ( m_power_timer ) | 1355 | if ( m_power_timer ) |
1349 | killTimer ( m_power_timer ); | 1356 | killTimer ( m_power_timer ); |
1350 | m_power_timer = startTimer ( 500 ); | 1357 | m_power_timer = startTimer ( 500 ); |
1351 | } | 1358 | } |
1352 | else if ( m_power_timer ) { | 1359 | else if ( m_power_timer ) { |
1353 | killTimer ( m_power_timer ); | 1360 | killTimer ( m_power_timer ); |