diff -r 24062c24fe38 -r 2a26698d78ba phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp --- a/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp Fri Mar 12 15:42:40 2010 +0200 +++ b/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp Mon Mar 15 12:40:24 2010 +0200 @@ -272,30 +272,27 @@ "CPhoneKeyEventForwarder::OfferKeyEventBeforeControlStackL"); TKeyResponse response( EKeyWasNotConsumed ); - if( !IsKeyBlocked( aKeyEvent ) ) + + // Handle key events before FEP + // This is must becouse FEP consumes * key and when + // editor is in alphanumeric mode FEP consumes all alphanumeric + // keys + switch( aType ) { - // Handle key events before FEP - // This is must becouse FEP consumes * key and when - // editor is in alphanumeric mode FEP consumes all alphanumeric - // keys - switch( aType ) - { - // EEventKeyDown - case EEventKeyDown: - response = HandleEventKeyDownBeforeControlStackL( aKeyEvent ); - break; - // EEventKey - case EEventKey: - response = HandleEventKeyBeforeControlStackL( aKeyEvent ); - break; - // EEventKeyUp - case EEventKeyUp: - response = HandleEventKeyUpBeforeControlStackL( aKeyEvent ); - break; - default: - break; - } - + // EEventKeyDown + case EEventKeyDown: + response = HandleEventKeyDownBeforeControlStackL( aKeyEvent ); + break; + // EEventKey + case EEventKey: + response = HandleEventKeyBeforeControlStackL( aKeyEvent ); + break; + // EEventKeyUp + case EEventKeyUp: + response = HandleEventKeyUpBeforeControlStackL( aKeyEvent ); + break; + default: + break; } return response; } @@ -313,23 +310,20 @@ __LOGMETHODSTARTEND( EPhoneControl, "CPhoneKeyEventForwarder::OfferKeyEventAfterControlStackL"); - if( !IsKeyBlocked( aKeyEvent ) ) + // Send key to editor + iStateMachine->State()->HandleKeyEventL( aKeyEvent, aType ); + + if( EEventKeyUp == aType + && EKeyNull != iKeyPressedDown ) { - // Send key to editor - iStateMachine->State()->HandleKeyEventL( aKeyEvent, aType ); - - if( EEventKeyUp == aType - && EKeyNull != iKeyPressedDown ) - { - // Handle short key press - iStateMachine->State()->HandleKeyMessageL( - MPhoneKeyEvents::EPhoneKeyShortPress, - TKeyCode( iKeyPressedDown ) ); + // Handle short key press + iStateMachine->State()->HandleKeyMessageL( + MPhoneKeyEvents::EPhoneKeyShortPress, + TKeyCode( iKeyPressedDown ) ); - // Reset key code - iScanCode = EStdKeyNull; - iKeyPressedDown = EKeyNull; - } + // Reset key code + iScanCode = EStdKeyNull; + iKeyPressedDown = EKeyNull; } return EKeyWasNotConsumed; @@ -547,32 +541,5 @@ "CPhoneKeyEventHandler::ConvertKeyCode aCode (%d)", aCode ); } -// ----------------------------------------------------------------------------- -// CPhoneKeyEventForwarder::IsKeyBlocked -// ----------------------------------------------------------------------------- -// -TBool CPhoneKeyEventForwarder::IsKeyBlocked( const TKeyEvent& aKeyEvent ) const - { - TBool ret = EFalse; - - // Check blocked keys - const RArray& keyScanCodeList = iStateMachine->State()->GetBlockedKeyList(); - TInt count = keyScanCodeList.Count(); - if( count ) - { - for( TInt i = 0; i < count; i++ ) - { - if( keyScanCodeList[i] == aKeyEvent.iScanCode ) - { - ret = ETrue; - } - } - } - __PHONELOG1( EBasic, EPhoneControl, - "CPhoneKeyEventHandler::IsKeyBlocked return (%d)", ret ); - - return ret; - } - // End of File