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 /libopie | |
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 |
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 | |||
@@ -1285,105 +1285,112 @@ OLedState iPAQ::ledState ( OLed l ) const | |||
1285 | } | 1285 | } |
1286 | } | 1286 | } |
1287 | 1287 | ||
1288 | bool iPAQ::setLedState ( OLed l, OLedState st ) | 1288 | bool iPAQ::setLedState ( OLed l, OLedState st ) |
1289 | { | 1289 | { |
1290 | static int fd = ::open ( "/dev/touchscreen/0", O_RDWR | O_NONBLOCK ); | 1290 | static int fd = ::open ( "/dev/touchscreen/0", O_RDWR | O_NONBLOCK ); |
1291 | 1291 | ||
1292 | if ( l == Led_Power ) { | 1292 | if ( l == Led_Power ) { |
1293 | if ( fd >= 0 ) { | 1293 | if ( fd >= 0 ) { |
1294 | LED_IN leds; | 1294 | LED_IN leds; |
1295 | ::memset ( &leds, 0, sizeof( leds )); | 1295 | ::memset ( &leds, 0, sizeof( leds )); |
1296 | leds. TotalTime = 0; | 1296 | leds. TotalTime = 0; |
1297 | leds. OnTime = 0; | 1297 | leds. OnTime = 0; |
1298 | leds. OffTime = 1; | 1298 | leds. OffTime = 1; |
1299 | leds. OffOnBlink = 2; | 1299 | leds. OffOnBlink = 2; |
1300 | 1300 | ||
1301 | switch ( st ) { | 1301 | switch ( st ) { |
1302 | case Led_Off : leds. OffOnBlink = 0; break; | 1302 | case Led_Off : leds. OffOnBlink = 0; break; |
1303 | case Led_On : leds. OffOnBlink = 1; break; | 1303 | case Led_On : leds. OffOnBlink = 1; break; |
1304 | case Led_BlinkSlow: leds. OnTime = 10; leds. OffTime = 10; break; | 1304 | case Led_BlinkSlow: leds. OnTime = 10; leds. OffTime = 10; break; |
1305 | case Led_BlinkFast: leds. OnTime = 5; leds. OffTime = 5; break; | 1305 | case Led_BlinkFast: leds. OnTime = 5; leds. OffTime = 5; break; |
1306 | } | 1306 | } |
1307 | 1307 | ||
1308 | if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) { | 1308 | if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) { |
1309 | m_leds [0] = st; | 1309 | m_leds [0] = st; |
1310 | return true; | 1310 | return true; |
1311 | } | 1311 | } |
1312 | } | 1312 | } |
1313 | } | 1313 | } |
1314 | return false; | 1314 | return false; |
1315 | } | 1315 | } |
1316 | 1316 | ||
1317 | 1317 | ||
1318 | bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) | 1318 | bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) |
1319 | { | 1319 | { |
1320 | int newkeycode = keycode; | 1320 | int newkeycode = keycode; |
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 ); |
1354 | m_power_timer = 0; | 1361 | m_power_timer = 0; |
1355 | QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false ); | 1362 | QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false ); |
1356 | QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false ); | 1363 | QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false ); |
1357 | } | 1364 | } |
1358 | newkeycode = Key_unknown; | 1365 | newkeycode = Key_unknown; |
1359 | break; | 1366 | break; |
1360 | } | 1367 | } |
1361 | } | 1368 | } |
1362 | 1369 | ||
1363 | if ( newkeycode != keycode ) { | 1370 | if ( newkeycode != keycode ) { |
1364 | if ( newkeycode != Key_unknown ) | 1371 | if ( newkeycode != Key_unknown ) |
1365 | QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); | 1372 | QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat ); |
1366 | return true; | 1373 | return true; |
1367 | } | 1374 | } |
1368 | else | 1375 | else |
1369 | return false; | 1376 | return false; |
1370 | } | 1377 | } |
1371 | 1378 | ||
1372 | void iPAQ::timerEvent ( QTimerEvent * ) | 1379 | void iPAQ::timerEvent ( QTimerEvent * ) |
1373 | { | 1380 | { |
1374 | killTimer ( m_power_timer ); | 1381 | killTimer ( m_power_timer ); |
1375 | m_power_timer = 0; | 1382 | m_power_timer = 0; |
1376 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false ); | 1383 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false ); |
1377 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); | 1384 | QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false ); |
1378 | } | 1385 | } |
1379 | 1386 | ||
1380 | 1387 | ||
1381 | void iPAQ::alarmSound ( ) | 1388 | void iPAQ::alarmSound ( ) |
1382 | { | 1389 | { |
1383 | #ifndef QT_NO_SOUND | 1390 | #ifndef QT_NO_SOUND |
1384 | static Sound snd ( "alarm" ); | 1391 | static Sound snd ( "alarm" ); |
1385 | int fd; | 1392 | int fd; |
1386 | int vol; | 1393 | int vol; |
1387 | bool vol_reset = false; | 1394 | bool vol_reset = false; |
1388 | 1395 | ||
1389 | if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { | 1396 | if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { |