summaryrefslogtreecommitdiff
authoraquadran <aquadran>2005-12-29 21:17:39 (UTC)
committer aquadran <aquadran>2005-12-29 21:17:39 (UTC)
commitd795d596af30d2856544b960d37e779659c324a6 (patch) (side-by-side diff)
tree651bdc5c29889c9a877178803aab38cba52ffa22
parentb12409a7785ddc05fa245de42bb19f3d15fde5d8 (diff)
downloadopie-d795d596af30d2856544b960d37e779659c324a6.zip
opie-d795d596af30d2856544b960d37e779659c324a6.tar.gz
opie-d795d596af30d2856544b960d37e779659c324a6.tar.bz2
changed power button mappings for h1915 and asus mypal 716
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp4
-rw-r--r--libopie2/opiecore/device/odevice_mypal.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 5272a3c..a221e23 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -280,64 +280,68 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
switch ( keycode ) {
// H38xx/H39xx have no "Q" key anymore - this is now the Mail key
case HardKey_Menu: {
if (( d->m_model == Model_iPAQ_H38xx ) ||
( d->m_model == Model_iPAQ_H39xx ) ||
( d->m_model == Model_iPAQ_H5xxx)) {
newkeycode = HardKey_Mail;
}
break;
}
// Rotate cursor keys 180 or 270
case Key_Left :
case Key_Right:
case Key_Up :
case Key_Down : {
if (( d->m_model == Model_iPAQ_H31xx ) ||
( d->m_model == Model_iPAQ_H38xx )) {
newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
}
// 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_H1940 ))
newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
break;
}
+ // map Power Button short/long press to F6 for h191x
+ case Key_F6:
+ if ( d->m_model != Model_iPAQ_H191x )
+ break;
// map Power Button short/long press to F34/F35
case Key_SysReq: {
if ( isPress ) {
if ( m_power_timer )
killTimer ( m_power_timer );
m_power_timer = startTimer ( 500 );
}
else if ( m_power_timer ) {
killTimer ( m_power_timer );
m_power_timer = 0;
QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
}
newkeycode = Key_unknown;
break;
}
}
if ( newkeycode != keycode ) {
if ( newkeycode != Key_unknown )
QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
return true;
}
else
return false;
}
void iPAQ::timerEvent ( QTimerEvent * )
{
killTimer ( m_power_timer );
m_power_timer = 0;
QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
diff --git a/libopie2/opiecore/device/odevice_mypal.cpp b/libopie2/opiecore/device/odevice_mypal.cpp
index da0272e..7e1245a 100644
--- a/libopie2/opiecore/device/odevice_mypal.cpp
+++ b/libopie2/opiecore/device/odevice_mypal.cpp
@@ -120,66 +120,66 @@ void MyPal::initButtons()
if (( mb->model & d->m_model ) == d->m_model ) {
b. setKeycode ( mb->code );
b. setUserText ( QObject::tr ( "Button", mb->utext ));
b. setPixmap ( OResource::loadPixmap ( mb->pix ));
b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( mb->fpressedservice ), mb->fpressedaction ));
b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( mb->fheldservice ), mb->fheldaction ));
d->m_buttons->append ( b );
}
}
reloadButtonMapping();
}
bool MyPal::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
{
int newkeycode = keycode;
switch ( keycode ) {
case Key_Left :
case Key_Right:
case Key_Up :
case Key_Down : {
// 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_MyPal_716 )
newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
break;
}
- // map Power Button short/long press to F34/F35
- case Key_SysReq: {
+ // map Power Button short/long press to F6
+ case Key_F6: {
if ( isPress ) {
if ( m_power_timer )
killTimer ( m_power_timer );
m_power_timer = startTimer ( 500 );
}
else if ( m_power_timer ) {
killTimer ( m_power_timer );
m_power_timer = 0;
QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
}
newkeycode = Key_unknown;
break;
}
}
if ( newkeycode != keycode ) {
if ( newkeycode != Key_unknown )
QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
return true;
}
else
return false;
}
void MyPal::timerEvent ( QTimerEvent * )
{
killTimer ( m_power_timer );
m_power_timer = 0;
QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
}