author | aquadran <aquadran> | 2006-12-13 20:36:14 (UTC) |
---|---|---|
committer | aquadran <aquadran> | 2006-12-13 20:36:14 (UTC) |
commit | bb6f32ae999168fc44d50d3523c3ef232824185a (patch) (side-by-side diff) | |
tree | 1d89bf239f98c4e3ce6fc83131b6b2c4ec5aac2c | |
parent | 5a0012fb3b75ff41437b0685386731d1367e4e7b (diff) | |
download | opie-bb6f32ae999168fc44d50d3523c3ef232824185a.zip opie-bb6f32ae999168fc44d50d3523c3ef232824185a.tar.gz opie-bb6f32ae999168fc44d50d3523c3ef232824185a.tar.bz2 |
changed suspend button mapping for mypal too same as for ipaqs
-rw-r--r-- | libopie2/opiecore/device/odevice_mypal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice_mypal.cpp b/libopie2/opiecore/device/odevice_mypal.cpp index 208be46..73b31cb 100644 --- a/libopie2/opiecore/device/odevice_mypal.cpp +++ b/libopie2/opiecore/device/odevice_mypal.cpp @@ -92,130 +92,130 @@ struct m_button mypal_buttons [] = { }; void MyPal::init(const QString& model) { d->m_vendorstr = "Asus"; d->m_vendor = Vendor_Asus; d->m_modelstr = model.mid(model.findRev('A')); if ( d->m_modelstr == "A716" ) d->m_model = Model_MyPal_716; else d->m_model = Model_Unknown; d->m_rotation = Rot0; m_power_timer = 0; } void MyPal::initButtons() { if ( d->m_buttons ) return; if ( isQWS( ) ) { addPreHandler(this); } d->m_buttons = new QValueList <ODeviceButton>; for ( uint i = 0; i < ( sizeof( mypal_buttons ) / sizeof( m_button )); i++ ) { m_button *mb = mypal_buttons + i; ODeviceButton b; 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 F6 - case Key_F6: { + // map Power Button short/long press + case HardKey_Suspend: { // Hope we don't have infinite recursion here: 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 ); } void MyPal::playAlarmSound() { #ifndef QT_NO_SOUND static Sound snd ( "alarm" ); if(!snd.isFinished()) return; changeMixerForAlarm(0, "/dev/sound/mixer", &snd ); snd. play(); #endif } bool MyPal::setDisplayBrightness ( int bright ) { bool res = false; if ( bright > 255 ) bright = 255; if ( bright < 0 ) bright = 0; QDir sysClass( "/sys/class/backlight/pxafb/" ); sysClass.setFilter(QDir::Dirs); int fd; if ( sysClass.exists() ) { QString sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/power" ); fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); if ( fd ) { char buf[10]; buf[0] = bright ? 0 : 4; |