author | zecke <zecke> | 2004-02-19 01:01:30 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-19 01:01:30 (UTC) |
commit | 3b4b9e070f84ce884a98b4112eaee2cef7530308 (patch) (unidiff) | |
tree | a63b57ec3368e41ea1482a37a41b4b9df2f30fd4 | |
parent | ab41e301eb7f06af0869844d197e38a7838f3f2d (diff) | |
download | opie-3b4b9e070f84ce884a98b4112eaee2cef7530308.zip opie-3b4b9e070f84ce884a98b4112eaee2cef7530308.tar.gz opie-3b4b9e070f84ce884a98b4112eaee2cef7530308.tar.bz2 |
The hardware keys on the H5xxx are rotated by 270°
so rotate the key events
-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 | |||
@@ -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 ); |
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 | |||
@@ -285,33 +285,39 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b | |||
285 | 285 | ||
286 | switch ( keycode ) { | 286 | switch ( keycode ) { |
287 | // H38xx/H39xx have no "Q" key anymore - this is now the Mail key | 287 | // H38xx/H39xx have no "Q" key anymore - this is now the Mail key |
288 | case HardKey_Menu: { | 288 | case HardKey_Menu: { |
289 | if (( d->m_model == Model_iPAQ_H38xx ) || | 289 | if (( d->m_model == Model_iPAQ_H38xx ) || |
290 | ( d->m_model == Model_iPAQ_H39xx ) || | 290 | ( d->m_model == Model_iPAQ_H39xx ) || |
291 | ( d->m_model == Model_iPAQ_H5xxx)) { | 291 | ( d->m_model == Model_iPAQ_H5xxx)) { |
292 | newkeycode = HardKey_Mail; | 292 | newkeycode = HardKey_Mail; |
293 | } | 293 | } |
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 : |
301 | case Key_Down : { | 301 | case Key_Down : { |
302 | if (( d->m_model == Model_iPAQ_H31xx ) || | 302 | if (( d->m_model == Model_iPAQ_H31xx ) || |
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 | ||
309 | // map Power Button short/long press to F34/F35 | 315 | // map Power Button short/long press to F34/F35 |
310 | case Key_SysReq: { | 316 | case Key_SysReq: { |
311 | if ( isPress ) { | 317 | if ( isPress ) { |
312 | if ( m_power_timer ) | 318 | if ( m_power_timer ) |
313 | killTimer ( m_power_timer ); | 319 | killTimer ( m_power_timer ); |
314 | m_power_timer = startTimer ( 500 ); | 320 | m_power_timer = startTimer ( 500 ); |
315 | } | 321 | } |
316 | else if ( m_power_timer ) { | 322 | else if ( m_power_timer ) { |
317 | killTimer ( m_power_timer ); | 323 | killTimer ( m_power_timer ); |