FCL/sf/mw/inputmethods: comparison textinput/peninputfingerhwrar/src/peninputfingerhwrarlayout.cpp

equal deleted inserted replaced

-:6ceef9a83b1a
+:6defe5d1bd39
 /*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 TCallBack( HandleGSRepositoryCallBack, this ),
 iRepositorySetting );
 //create state manager
 CreateStateManagerL();
+	//create the arabic window control
 CreateHwrWindowL();
+	//retrieve the settings
 LoadAndPublishDefaultL();
 //set screen layout extent
 SetRect( TRect( TPoint( 0, 0 ), ScreenSize() ) );
 }
 // ---------------------------------------------------------------------------
 if ( CFepUiLayout::HandleCommand( aCmd, aData ) == KErrNone )
 {
 return KErrNone;
 }
-TInt ret = KErrUnknown;
+TInt ret = KErrNone;
 switch ( aCmd )
 {
 case ECmdPenInputEditorNumericKeyMap:
 {
 iDataStore->SetNumberMode( *(TAknEditorNumericKeymap*)aData );
 case ECmdPenInputEditorCustomNumericKeyMap:
 {
 TInt len = *( TInt* )( aData - KIntSize );
 TPtrC16 keymapRes( (TUint16*)aData, len / 2 );
 iDataStore->SetCustomNumberModeL( keymapRes );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputPermittedRange:
 {
 TInt ranges = *(TInt*)aData;
 iDataStore->SetPermittedRanges( ranges );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputLanguage:
 {
 TInt language = *( TInt* )aData;
 iDataStore->SetLanguageL( language );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputPermittedCase:
 {
 TInt cs = *( TInt* )aData;
 iDataStore->SetPermittedCases( cs );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputCase:
 {
 TInt cs = *( TInt* )aData;
 iDataStore->SetCase( cs );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputWindowOpen:
 {
 LayoutOwner()->Hide( EFalse );
 RootControl()->UpdateValidRegion( NULL, EFalse );
+			// tell the engine the hwr writing area
 TRect hwrRect = iHwrWnd->WritingBoxRect();
 TSize hwrSize = hwrRect.Size();
 iDataStore->SetInputAreaSize(hwrSize);
 iDataStore->SetScreenSize(hwrSize);
+			// tell the HWR window to handle the window open command
+iHwrWnd->HandleWindowOpenCommandL();
+			// switch to standby state
 ChangeCurStateToStandby();
-iDataStore->GetKeyboardType();
-iDataStore->SetKeyboardToQwerty();
-ret = KErrNone;
 }
 break;
 case ECmdPenInputWindowClose:
 {
-iDataStore->ResetKeyboardType();
 LayoutOwner()->Hide( ETrue );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputSetTextAlignment:
 {
 iHwrWnd->SetTextAlignmentL( *aData, ELangArabic );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputSetPromptText:
 {
 iHwrWnd->SetPromptTextL( aData );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputDimArrowKeys:
 {
 TBool IsDimArrowKeys = *aData;
 iHwrWnd->DimArrowKeys( IsDimArrowKeys );
-ret = KErrNone;
 }
 break;
 case ECmdPenInputCharacterPreview:
 {
 iHwrWnd->ShowBubble(*aData);
 TBool isEnableSetting = *aData;
 iHwrWnd->SetEnableSettingBtn(isEnableSetting);
 }
 break;
 default:
+		    ret = KErrUnknown;
 break;
 }
 return ret;
 }
 const TFepInputContextFieldData& aData )
 {
 if ( iHwrWnd )
 {
 TRAPD( err, iHwrWnd->SetEditorTextL( aData ) );
+		if(err != KErrNone)
+		    {
+			return err;
+			}
 		//
 	    // implement the feature: the candiates will be filtered according to the char after the cursor
 	    //
 		//
 		if(aData.iFlag & EFepICFDataDirectionMFNE )
 			{
 			return KErrNone;
 			}
 		iDataStore->SetFirstCandidateType(ECandDefaultFirst);
+		if(iDataStore->PrimaryRange() == ERangeEnglish)
+		    {
+		    return KErrNone;
+		    }
 		TUint16 charBeforeCursor = 0;
 if(iHwrWnd->GetCharBeforeCursor(aData.iCurSel.LowerPos()-1, charBeforeCursor))
 		    {
 			TFirstCandidateType candtype = ECandDefaultFirst;
 				}
 			iDataStore->SetFirstCandidateType(candtype);
 			}
-return err;
+return KErrNone;
 }
 return KErrNone;
 }
 // Called by owner when the layout is going to be hidden.
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArLayout::OnDeActivate()
 {
-// cancel writing
+ChangeCurStateToStandby();
-iHwrWnd->CancelWriting();
-	// close the symbol table if it's showing up
-iHwrWnd->CloseSymbolTable();
-	// close the candidate list if it's showing up
-iHwrWnd->CloseCandidateList();
 CFepUiLayout::OnDeActivate();
 }
 // ---------------------------------------------------------------------------
 break;
 case EHwrEventOutsideEvent:
 {
 ChangeCurStateToStandby();
-iHwrWnd->CloseSymbolTable();
 }
 break;
 default:
 break;
 switch ( watcher->ChangedKey() )
 {
 case KSettingsWritingSpeed:
 {
 self->SetWritingSpeed( newValue );
-}
-break;
-case KSettingsPenWidth:
-{
-self->SetBoxPenSize( TSize( newValue, newValue ) );
 }
 break;
 case KSettingsPenColor:
 {
 self->SetBoxPenColor( newValue );
 TInt newValue;
 iRepositorySetting->Get( KSettingsWritingSpeed, newValue );
 SetWritingSpeed( newValue );
+	iRepositorySetting->Get(KSettingsPenInputGuideLine,newValue);
+	SetGuideLineOn(newValue);
 iRepositorySetting->Get( KSettingsPenWidth, newValue );
 SetBoxPenSize( TSize( newValue, newValue ) );
 newValue = GetPenTrailColor();
 SetBoxPenColor( newValue );
 switch ( aCtrl->ControlId() )
 {
 case EHwrCtrlIdClose:
 {
-// Go to standby when button up before character timeout
+// Go to standby before closing layout
-if ( iDataStore->StartCharacter())
+ChangeCurStateToStandby();
-{
-iDataStore->SetStartCharacter(EFalse);
-iHwrWnd->CancelWriting();
-ChangeCurStateToStandby();
-iHwrWnd->CloseCandidateList();
-}
 SignalOwner( ESignalLayoutClosed );
 }
 break;
 case EHwrCtrlIdLanguageOption:
 {
 OnDeActivate();
 }
 break;
 case EHwrCtrlIdSymbolButton:
 {
-// Go to standby when button up before character timeout
+// Go to standby before opening symbol table
-if ( iDataStore->StartCharacter())
+			ChangeCurStateToStandby();
-{
+			iHwrWnd->OpenSymbolTable();
-iDataStore->SetStartCharacter(EFalse);
-iHwrWnd->CancelWriting();
-ChangeCurStateToStandby();
-iHwrWnd->CloseCandidateList();
-}
-if(iHwrWnd->IsSymbolTableShowingUp())
-	{
-iHwrWnd->CloseSymbolTable();
-}
-else
-{
-ChangeCurStateToStandby();
-iHwrWnd->OpenSymbolTable();
-}
 }
 break;
 case EHwrCtrlId3Page1Btn:
 {
 iHwrWnd->ShowSymbolPage( 1, EPagePosPageNo );
 void CPeninputFingerHwrArLayout::OnBackspaceClickedL()
 {
 	iHwrWnd->CancelWriting();
 if (iHwrWnd->IsCandidateShowup())
 {
 // goto standby and clear screen
-iDataStore->SetStartCharacter(EFalse);
 		ChangeCurStateToStandby();
-	    iHwrWnd->CloseCandidateList();
 }
 else
 {
 SubmitCharToFep( EKeyBackspace );
 iStateMgr->HandleEventL( EHwrEventKeyBack, KNullDesC );
-		if(iDataStore->StartCharacter())
+		if(iIsStrokeOfDrawingCharacerStarted)
 		    {
 			ChangeCurStateToStandby();
-		    iHwrWnd->CloseCandidateList();;
 			}
 }
 }
 // ---------------------------------------------------------------------------
 }
 iStateMgr->HandleEventL( EHwrEventCandidateSelected, aData );
 ChangeCurStateToStandby();
-iHwrWnd->CloseCandidateList();;
 }
 // ---------------------------------------------------------------------------
 // clicked event handler of icf.
 //
 void CPeninputFingerHwrArLayout::OnIcfClicked()
 {
 // Go to standby
 	ChangeCurStateToStandby();
-	if(iHwrWnd->IsCandidateShowup())
-	    {
-		iHwrWnd->CloseCandidateList();
-		}
 	}
 // ---------------------------------------------------------------------------
 // handler of StrokeStarted event.
 // ---------------------------------------------------------------------------
 	    {
 		iHwrWnd->CloseCandidateList();
 		}
 	// remember the start writing position.
-iDataStore->SetStartCharacter(ETrue);
+	iIsStrokeOfDrawingCharacerStarted = ETrue;
 iStateMgr->HandleEventL( EEventHwrStrokeStarted, KNullDesC );
 }
 // ---------------------------------------------------------------------------
 // handler of StrokeFinished event.
 // handler of CharacterFinished event.
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArLayout::OnHwrCharacterFinishedL()
 {
-iDataStore->SetStartCharacter( EFalse );
+iIsStrokeOfDrawingCharacerStarted = EFalse;
 RArray<TPoint> points = iHwrWnd->StrokeList();
 TPtrC ptr;
 ptr.Set( reinterpret_cast<TText*>( &points ), sizeof(&points) );
 iStateMgr->HandleEventL( EEventHwrCharacterTimerOut, ptr );
 	iHwrWnd->OpenCandidateList();
 	}
 // ---------------------------------------------------------------------------
 // get value from repository.
 // change current state manager to standby state.
 // ---------------------------------------------------------------------------
 //
 void CPeninputFingerHwrArLayout::ChangeCurStateToStandby()
 {
+	iIsStrokeOfDrawingCharacerStarted = EFalse;
 	iHwrWnd->CancelWriting();
+	// close the candidate list if it's currently showing up
+	if(iHwrWnd->IsCandidateShowup())
+	    {
+		iHwrWnd->CloseCandidateList();
+		}
+	// close the symbol table
+if(iHwrWnd->IsSymbolTableShowingUp())
+		{
+		iHwrWnd->CloseSymbolTable();
+		}
+// set the state to be standby
 iStateMgr->SetState( CPeninputFingerHwrArStateManagerBase::EStateStandBy );
 }
 //End of file

branch	RCL_3
changeset 10	6defe5d1bd39
parent 8	6ceef9a83b1a
child 19	5e18d8c489d6