FCL/sf/app/phone: comparison phoneapp/phoneuiutils/src/cphoneqwertyhandler.cpp

equal deleted inserted replaced

-:544e34b3255a
+:91c2fb4b78df
 #include    "cphoneqwertymodemonitor.h"
 #include    <PtiEngine.h>
 #include    <w32std.h>
 // CONSTANTS
+static const TUint32 KNumKeyModifiers( EModifierLeftShift | EModifierRightShift | EModifierShift |
+EModifierLeftFunc | EModifierRightFunc | EModifierFunc );
 // FORWARD DECLARATIONS
 // ============================ MEMBER FUNCTIONS ===============================
 iInputLanguageId = iLangSettingMonitor->InputLanguage();
 iQwertyMode = iQwertyModeMonitor->QwertyMode();
 if ( iQwertyMode )
 {
 LoadNumericKeyBindings( iInputLanguageId, iQwertyModeMonitor->Keyboard() );
 }
 }
 // -----------------------------------------------------------------------------
 // CPhoneQwertyHandler::NewL
 self->ConstructL();
 CleanupStack::Pop( self );
 return self;
 }
 // Destructor
 EXPORT_C CPhoneQwertyHandler::~CPhoneQwertyHandler()
 {
 	iLangSettingMonitor->RemoveObserver( *this );
 delete iLangSettingMonitor;
 // CPhoneQwertyHandler::IsQwertyInput
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CPhoneQwertyHandler::IsQwertyInput() const
 {
 return iQwertyMode > 0 ? ETrue : EFalse;
 }
 // -----------------------------------------------------------------------------
 // CPhoneQwertyHandler::HandleLanguageSettingChange
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void CPhoneQwertyHandler::HandleQwertyModeChange( TInt aMode )
 {
 iQwertyMode = aMode;
 #ifndef RD_INTELLIGENT_TEXT_INPUT
 if ( iQwertyMode && !iNumericKeys.Count() )
 {
 LoadNumericKeyBindings( iInputLanguageId, iQwertyModeMonitor->Keyboard() );
 }
 #endif
 }
 // -----------------------------------------------------------------------------
 // CPhoneQwertyHandler::HandleKeyboardLayoutChange
 // This event comes after HandleQwertyModeChange
 // -----------------------------------------------------------------------------
 //
 void CPhoneQwertyHandler::HandleKeyboardLayoutChange()
 {
+LoadNumericKeyBindings( iInputLanguageId, iQwertyModeMonitor->Keyboard() );
-LoadNumericKeyBindings( iInputLanguageId, iQwertyModeMonitor->Keyboard() );
 }
 // -----------------------------------------------------------------------------
 // CPhoneQwertyHandler::LoadNumericKeyBindings
 // -----------------------------------------------------------------------------
 CPtiEngine* ptiEngine = CPtiEngine::NewL();
 CleanupStack::PushL( ptiEngine );
 ptiEngine->GetNumericModeKeysForQwertyL( aLanguage,
 iNumericKeys,
 keyboard );
 CleanupStack::PopAndDestroy( ptiEngine );
 } ); // TRAP
 #else
 TRAPD( err,
 {
 CPtiEngine* ptiEngine = CPtiEngine::NewL();
 CleanupStack::PushL( ptiEngine );
 ptiEngine->GetNumericModeKeysForQwertyL( aLanguage,
 iNumericKeys );
 CleanupStack::PopAndDestroy( ptiEngine );
 } ); // TRAP
 #endif
 if ( err )
 {
 iNumericKeys.Reset();
 iQwertyMode = 0; // To default mode
 }
 else
 TPtiNumericKeyBinding numKeyBind = iNumericKeys[numericKeysCount];
 // This is PTI bug? Should not be in numeric keys list.
 if ( numKeyBind.iKey == EPtiKeyQwertySpace )
 {
 iNumericKeys.Remove( numericKeysCount );
 }
 }
 }
 }
 // -----------------------------------------------------------------------------
 // CPhoneQwertyHandler::NumericKeyCode
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TInt CPhoneQwertyHandler::NumericKeyCode( const TKeyEvent& aKeyEvent )
 {
+TInt keyCode( EKeyNull );
-// Check shift state
-TBool shiftActive(EFalse);
+// It's possible that there are several numeric mode characters in same
-shiftActive = aKeyEvent.iModifiers & EModifierLeftShift ||
+// QWERTY key (for example, '2' and 'w' may be on same button) and there must
-aKeyEvent.iModifiers & EModifierRightShift; //||
+// be a way to enter each of these.
+// Select numeric mode key code for the key event with the following logic:
-TInt numericKeysCount = iNumericKeys.Count();
+// 1. If key contains exactly one numeric mode character, return that
+//    regardless of the current modifiers.
-while ( numericKeysCount-- )
+// 2a. If key has two numeric mode characters, then actual numbers are preferred.
-{
+//     Pressing such key without modifiers will produce the number character.
-TPtiNumericKeyBinding numKeyBind = iNumericKeys[numericKeysCount];
+// 2b. Pressing key with two numeric mode characters together with any modifier
+//     (Fn, Shift, Chr) will produce the secondary numeric mode character.
-TBool shiftRequired = ( numKeyBind.iCase ==EPtiCaseUpper ) ||
+// 3. More than two numeric mode characters on one key are not supported.
-( numKeyBind.iCase ==EPtiCaseChrUpper );
+//    Such cases shouldn't ever occur, but if they will, then this algorithm
+//    must be changed.
-if ( numKeyBind.iKey == aKeyEvent.iScanCode &&
-(shiftRequired == shiftActive  )   )
+// Check modifier state
+TBool modifierActive = ( aKeyEvent.iModifiers & KNumKeyModifiers );
+TInt numBindIdx = iNumericKeys.Count();
+while ( numBindIdx-- )
+{
+const TPtiNumericKeyBinding& numKeyBind = iNumericKeys[numBindIdx];
+if ( numKeyBind.iKey == aKeyEvent.iScanCode )
 {
-return numKeyBind.iChar;
+if ( !keyCode )
+{
+// first match for this key
+keyCode = numKeyBind.iChar;
+}
+else
+{
+// Second numeric mode character for this key. Override
+// previous code if it was the number character but some
+// modifier is active or it was not number character and no
+// modifiers are active.
+if ( ( IsNumber(keyCode) && modifierActive ) ||
+( !IsNumber(keyCode) && !modifierActive ) )
+{
+keyCode = numKeyBind.iChar;
+}
+}
 }
 }
-return EKeyNull;
+return keyCode;
 }
+// -----------------------------------------------------------------------------
+// CPhoneQwertyHandler::ConvertToNumeric
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TBool CPhoneQwertyHandler::ConvertToNumeric( TKeyEvent& aKeyEvent )
+{
+TBool ret( EFalse );
+TInt numericCode = NumericKeyCode( aKeyEvent );
+if ( numericCode )
+{
+aKeyEvent.iCode = numericCode;
+aKeyEvent.iModifiers &= ~KNumKeyModifiers;
+ret = ETrue;
+}
+return ret;
+}
 // -----------------------------------------------------------------------------
 // CPhoneQwertyHandler::AddQwertyModeObserverL
 // -----------------------------------------------------------------------------
 //
 // Observer need to be notified with a current qwerty status so that
 // status dependent objects would get correct initial value.
 aObserver.HandleQwertyModeChange( iQwertyMode );
 }
+// -----------------------------------------------------------------------------
+// CPhoneQwertyHandler::IsNumber
+// -----------------------------------------------------------------------------
+//
+TBool CPhoneQwertyHandler::IsNumber( TText aChar ) const
+{
+return TChar( aChar ).IsDigit();
+}
 //  End of File

branch	RCL_3
changeset 25	91c2fb4b78df
parent 17	38529f706030