X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=4eb5662ea8e8e802c7ac265c8103b98a33e6e80a;hp=dbbf52356da6fa7c65c4f56b4f2e044ae1e20831;hb=660728e83fd72194f53642fd74c09db561f88496;hpb=59d3e8a364401fb6631aa3954f48ed5781b8b9c4 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index dbbf523..4eb5662 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -31,6 +31,7 @@ #include #include #include +#include namespace { @@ -98,13 +99,38 @@ FontDescriptionRun& UpdateSelectionFontStyleRun( EventData* eventData, return fontDescriptionRun; } -ControllerPtr Controller::New( ControlInterface& controlInterface ) +// public : Constructor. + +ControllerPtr Controller::New() +{ + return ControllerPtr( new Controller() ); +} + +ControllerPtr Controller::New( ControlInterface* controlInterface ) { return ControllerPtr( new Controller( controlInterface ) ); } +ControllerPtr Controller::New( ControlInterface* controlInterface, + EditableControlInterface* editableControlInterface ) +{ + return ControllerPtr( new Controller( controlInterface, + editableControlInterface ) ); +} + +// public : Configure the text controller. + void Controller::EnableTextInput( DecoratorPtr decorator ) { + if( !decorator ) + { + delete mImpl->mEventData; + mImpl->mEventData = NULL; + + // Nothing else to do. + return; + } + if( NULL == mImpl->mEventData ) { mImpl->mEventData = new EventData( decorator ); @@ -134,11 +160,11 @@ bool Controller::IsMarkupProcessorEnabled() const void Controller::SetAutoScrollEnabled( bool enable ) { - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable)?"true":"false", ( mImpl->mLayoutEngine.GetLayout() == LayoutEngine::SINGLE_LINE_BOX)?"true":"false", this ); + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable)?"true":"false", ( mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX)?"true":"false", this ); - if ( mImpl->mLayoutEngine.GetLayout() == LayoutEngine::SINGLE_LINE_BOX ) + if( mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX ) { - if ( enable ) + if( enable ) { DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled for SINGLE_LINE_BOX\n" ); mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -159,21 +185,21 @@ void Controller::SetAutoScrollEnabled( bool enable ) REORDER ); } - mImpl->mAutoScrollEnabled = enable; + mImpl->mIsAutoScrollEnabled = enable; mImpl->RequestRelayout(); } else { DALI_LOG_WARNING( "Attempted AutoScrolling on a non SINGLE_LINE_BOX, request ignored\n" ); - mImpl->mAutoScrollEnabled = false; + mImpl->mIsAutoScrollEnabled = false; } } bool Controller::IsAutoScrollEnabled() const { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", (mImpl->mAutoScrollEnabled)?"true":"false" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", mImpl->mIsAutoScrollEnabled?"true":"false" ); - return mImpl->mAutoScrollEnabled; + return mImpl->mIsAutoScrollEnabled; } CharacterDirection Controller::GetAutoScrollDirection() const @@ -185,10 +211,10 @@ float Controller::GetAutoScrollLineAlignment() const { float offset = 0.f; - if( mImpl->mVisualModel && - ( 0u != mImpl->mVisualModel->mLines.Count() ) ) + if( mImpl->mModel->mVisualModel && + ( 0u != mImpl->mModel->mVisualModel->mLines.Count() ) ) { - offset = ( *mImpl->mVisualModel->mLines.Begin() ).alignmentOffset; + offset = ( *mImpl->mModel->mVisualModel->mLines.Begin() ).alignmentOffset; } return offset; @@ -202,7 +228,6 @@ void Controller::SetHorizontalScrollEnabled( bool enable ) mImpl->mEventData->mDecorator->SetHorizontalScrollEnabled( enable ); } } - bool Controller::IsHorizontalScrollEnabled() const { if( ( NULL != mImpl->mEventData ) && @@ -257,6 +282,117 @@ bool Controller::IsSmoothHandlePanEnabled() const return false; } +void Controller::SetMaximumNumberOfCharacters( Length maxCharacters ) +{ + mImpl->mMaximumNumberOfCharacters = maxCharacters; +} + +int Controller::GetMaximumNumberOfCharacters() +{ + return mImpl->mMaximumNumberOfCharacters; +} + +void Controller::SetEnableCursorBlink( bool enable ) +{ + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" ); + + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mCursorBlinkEnabled = enable; + + if( !enable && + mImpl->mEventData->mDecorator ) + { + mImpl->mEventData->mDecorator->StopCursorBlink(); + } + } +} + +bool Controller::GetEnableCursorBlink() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mCursorBlinkEnabled; + } + + return false; +} + +void Controller::SetMultiLineEnabled( bool enable ) +{ + const Layout::Engine::Type layout = enable ? Layout::Engine::MULTI_LINE_BOX : Layout::Engine::SINGLE_LINE_BOX; + + if( layout != mImpl->mLayoutEngine.GetLayout() ) + { + // Set the layout type. + mImpl->mLayoutEngine.SetLayout( layout ); + + // Set the flags to redo the layout operations + const OperationsMask layoutOperations = static_cast( LAYOUT | + UPDATE_LAYOUT_SIZE | + ALIGN | + REORDER ); + + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | layoutOperations ); + + mImpl->RequestRelayout(); + } +} + +bool Controller::IsMultiLineEnabled() const +{ + return Layout::Engine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout(); +} + +void Controller::SetHorizontalAlignment( Layout::HorizontalAlignment alignment ) +{ + if( alignment != mImpl->mModel->mHorizontalAlignment ) + { + // Set the alignment. + mImpl->mModel->mHorizontalAlignment = alignment; + + // Set the flag to redo the alignment operation. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); + + mImpl->RequestRelayout(); + } +} + +Layout::HorizontalAlignment Controller::GetHorizontalAlignment() const +{ + return mImpl->mModel->mHorizontalAlignment; +} + +void Controller::SetVerticalAlignment( Layout::VerticalAlignment alignment ) +{ + if( alignment != mImpl->mModel->mVerticalAlignment ) + { + // Set the alignment. + mImpl->mModel->mVerticalAlignment = alignment; + + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); + + mImpl->RequestRelayout(); + } +} + +Layout::VerticalAlignment Controller::GetVerticalAlignment() const +{ + return mImpl->mModel->mVerticalAlignment; +} + +void Controller::SetTextElideEnabled( bool enabled ) +{ + mImpl->mModel->mElideEnabled = enabled; +} + +bool Controller::IsTextElideEnabled() const +{ + return mImpl->mModel->mElideEnabled; +} + +// public : Update + void Controller::SetText( const std::string& text ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" ); @@ -286,10 +422,10 @@ void Controller::SetText( const std::string& text ) if( !text.empty() ) { - mImpl->mVisualModel->SetTextColor( mImpl->mTextColor ); + mImpl->mModel->mVisualModel->SetTextColor( mImpl->mTextColor ); - MarkupProcessData markupProcessData( mImpl->mLogicalModel->mColorRuns, - mImpl->mLogicalModel->mFontDescriptionRuns ); + MarkupProcessData markupProcessData( mImpl->mModel->mLogicalModel->mColorRuns, + mImpl->mModel->mLogicalModel->mFontDescriptionRuns ); Length textSize = 0u; const uint8_t* utf8 = NULL; @@ -310,7 +446,7 @@ void Controller::SetText( const std::string& text ) } // Convert text into UTF-32 - Vector& utf32Characters = mImpl->mLogicalModel->mText; + Vector& utf32Characters = mImpl->mModel->mLogicalModel->mText; utf32Characters.Resize( textSize ); // Transform a text array encoded in utf8 into an array encoded in utf32. @@ -319,10 +455,10 @@ void Controller::SetText( const std::string& text ) utf32Characters.Resize( characterCount ); DALI_ASSERT_DEBUG( textSize >= characterCount && "Invalid UTF32 conversion length" ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, textSize, mImpl->mLogicalModel->mText.Count() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, textSize, mImpl->mModel->mLogicalModel->mText.Count() ); // The characters to be added. - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mLogicalModel->mText.Count(); + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); // To reset the cursor position lastCursorIndex = characterCount; @@ -355,8 +491,11 @@ void Controller::SetText( const std::string& text ) mImpl->mEventData->mEventQueue.clear(); } - // Do this last since it provides callbacks into application code - mImpl->mControlInterface.TextChanged(); + // Do this last since it provides callbacks into application code. + if( NULL != mImpl->mEditableControlInterface ) + { + mImpl->mEditableControlInterface->TextChanged(); + } } void Controller::GetText( std::string& text ) const @@ -387,7 +526,7 @@ void Controller::SetPlaceholderText( PlaceholderType type, const std::string& te // Update placeholder if there is no text if( mImpl->IsShowingPlaceholderText() || - ( 0u == mImpl->mLogicalModel->mText.Count() ) ) + ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) ) { ShowPlaceholderText(); } @@ -409,16 +548,23 @@ void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) c } } -void Controller::SetMaximumNumberOfCharacters( Length maxCharacters ) +void Controller::UpdateAfterFontChange( const std::string& newDefaultFont ) { - mImpl->mMaximumNumberOfCharacters = maxCharacters; -} + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange\n"); -int Controller::GetMaximumNumberOfCharacters() -{ - return mImpl->mMaximumNumberOfCharacters; + if( !mImpl->mFontDefaults->familyDefined ) // If user defined font then should not update when system font changes + { + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() ); + mImpl->mFontDefaults->mFontDescription.family = newDefaultFont; + + ClearFontData(); + + mImpl->RequestRelayout(); + } } +// public : Default style & Input style + void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) { if( NULL == mImpl->mFontDefaults ) @@ -565,110 +711,23 @@ float Controller::GetDefaultPointSize() const return 0.0f; } -void Controller::UpdateAfterFontChange( const std::string& newDefaultFont ) -{ - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange\n"); - - if( !mImpl->mFontDefaults->familyDefined ) // If user defined font then should not update when system font changes - { - DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() ); - mImpl->mFontDefaults->mFontDescription.family = newDefaultFont; - - ClearFontData(); - - mImpl->RequestRelayout(); - } -} - -void Controller::SetTextColor( const Vector4& textColor ) +void Controller::SetDefaultColor( const Vector4& color ) { - mImpl->mTextColor = textColor; + mImpl->mTextColor = color; if( !mImpl->IsShowingPlaceholderText() ) { - mImpl->mVisualModel->SetTextColor( textColor ); + mImpl->mModel->mVisualModel->SetTextColor( color ); mImpl->RequestRelayout(); } } -const Vector4& Controller::GetTextColor() const +const Vector4& Controller::GetDefaultColor() const { return mImpl->mTextColor; } -bool Controller::RemoveText( int cursorOffset, - int numberOfCharacters, - UpdateInputStyleType type ) -{ - bool removed = false; - - if( NULL == mImpl->mEventData ) - { - return removed; - } - - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfCharacters %d\n", - this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfCharacters ); - - if( !mImpl->IsShowingPlaceholderText() ) - { - // Delete at current cursor position - Vector& currentText = mImpl->mLogicalModel->mText; - CharacterIndex& oldCursorIndex = mImpl->mEventData->mPrimaryCursorPosition; - - CharacterIndex cursorIndex = oldCursorIndex; - - // Validate the cursor position & number of characters - if( static_cast< CharacterIndex >( std::abs( cursorOffset ) ) <= cursorIndex ) - { - cursorIndex = oldCursorIndex + cursorOffset; - } - - if( ( cursorIndex + numberOfCharacters ) > currentText.Count() ) - { - numberOfCharacters = currentText.Count() - cursorIndex; - } - - if( ( cursorIndex + numberOfCharacters ) <= mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters ) - { - // Mark the paragraphs to be updated. - mImpl->mTextUpdateInfo.mCharacterIndex = std::min( cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex ); - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove += numberOfCharacters; - - // Update the input style and remove the text's style before removing the text. - - if( UPDATE_INPUT_STYLE == type ) - { - // Set first the default input style. - mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle ); - - // Update the input style. - mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle ); - } - - // Updates the text style runs by removing characters. Runs with no characters are removed. - mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfCharacters ); - - // Remove the characters. - Vector::Iterator first = currentText.Begin() + cursorIndex; - Vector::Iterator last = first + numberOfCharacters; - - currentText.Erase( first, last ); - - // Cursor position retreat - oldCursorIndex = cursorIndex; - - mImpl->mEventData->mScrollAfterDelete = true; - - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters ); - removed = true; - } - } - - return removed; -} - void Controller::SetPlaceholderTextColor( const Vector4& textColor ) { if( NULL != mImpl->mEventData ) @@ -678,7 +737,7 @@ void Controller::SetPlaceholderTextColor( const Vector4& textColor ) if( mImpl->IsShowingPlaceholderText() ) { - mImpl->mVisualModel->SetTextColor( textColor ); + mImpl->mModel->mVisualModel->SetTextColor( textColor ); mImpl->RequestRelayout(); } } @@ -695,102 +754,62 @@ const Vector4& Controller::GetPlaceholderTextColor() const void Controller::SetShadowOffset( const Vector2& shadowOffset ) { - mImpl->mVisualModel->SetShadowOffset( shadowOffset ); + mImpl->mModel->mVisualModel->SetShadowOffset( shadowOffset ); mImpl->RequestRelayout(); } const Vector2& Controller::GetShadowOffset() const { - return mImpl->mVisualModel->GetShadowOffset(); + return mImpl->mModel->mVisualModel->GetShadowOffset(); } void Controller::SetShadowColor( const Vector4& shadowColor ) { - mImpl->mVisualModel->SetShadowColor( shadowColor ); + mImpl->mModel->mVisualModel->SetShadowColor( shadowColor ); mImpl->RequestRelayout(); } const Vector4& Controller::GetShadowColor() const { - return mImpl->mVisualModel->GetShadowColor(); -} - -void Controller::SetDefaultShadowProperties( const std::string& shadowProperties ) -{ - if( NULL == mImpl->mShadowDefaults ) - { - mImpl->mShadowDefaults = new ShadowDefaults(); - } - - mImpl->mShadowDefaults->properties = shadowProperties; -} - -const std::string& Controller::GetDefaultShadowProperties() const -{ - if( NULL != mImpl->mShadowDefaults ) - { - return mImpl->mShadowDefaults->properties; - } - - return EMPTY_STRING; + return mImpl->mModel->mVisualModel->GetShadowColor(); } void Controller::SetUnderlineColor( const Vector4& color ) { - mImpl->mVisualModel->SetUnderlineColor( color ); + mImpl->mModel->mVisualModel->SetUnderlineColor( color ); mImpl->RequestRelayout(); } const Vector4& Controller::GetUnderlineColor() const { - return mImpl->mVisualModel->GetUnderlineColor(); + return mImpl->mModel->mVisualModel->GetUnderlineColor(); } void Controller::SetUnderlineEnabled( bool enabled ) { - mImpl->mVisualModel->SetUnderlineEnabled( enabled ); + mImpl->mModel->mVisualModel->SetUnderlineEnabled( enabled ); mImpl->RequestRelayout(); } bool Controller::IsUnderlineEnabled() const { - return mImpl->mVisualModel->IsUnderlineEnabled(); + return mImpl->mModel->mVisualModel->IsUnderlineEnabled(); } void Controller::SetUnderlineHeight( float height ) { - mImpl->mVisualModel->SetUnderlineHeight( height ); + mImpl->mModel->mVisualModel->SetUnderlineHeight( height ); mImpl->RequestRelayout(); } float Controller::GetUnderlineHeight() const { - return mImpl->mVisualModel->GetUnderlineHeight(); -} - -void Controller::SetDefaultUnderlineProperties( const std::string& underlineProperties ) -{ - if( NULL == mImpl->mUnderlineDefaults ) - { - mImpl->mUnderlineDefaults = new UnderlineDefaults(); - } - - mImpl->mUnderlineDefaults->properties = underlineProperties; -} - -const std::string& Controller::GetDefaultUnderlineProperties() const -{ - if( NULL != mImpl->mUnderlineDefaults ) - { - return mImpl->mUnderlineDefaults->properties; - } - - return EMPTY_STRING; + return mImpl->mModel->mVisualModel->GetUnderlineHeight(); } void Controller::SetDefaultEmbossProperties( const std::string& embossProperties ) @@ -860,10 +879,10 @@ void Controller::SetInputColor( const Vector4& color ) const Length lengthOfSelectedText = ( handlesCrossed ? mImpl->mEventData->mLeftSelectionPosition : mImpl->mEventData->mRightSelectionPosition ) - startOfSelectedText; // Add the color run. - const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count(); - mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); + const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mColorRuns.Count(); + mImpl->mModel->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); - ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); + ColorRun& colorRun = *( mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); colorRun.color = color; colorRun.characterRun.characterIndex = startOfSelectedText; colorRun.characterRun.numberOfCharacters = lengthOfSelectedText; @@ -896,14 +915,14 @@ void Controller::SetInputFontFamily( const std::string& fontFamily ) if( NULL != mImpl->mEventData ) { mImpl->mEventData->mInputStyle.familyName = fontFamily; - mImpl->mEventData->mInputStyle.familyDefined = true; + mImpl->mEventData->mInputStyle.isFamilyDefined = true; if( EventData::SELECTING == mImpl->mEventData->mState ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel, + mImpl->mModel->mLogicalModel, startOfSelectedText, lengthOfSelectedText ); @@ -955,14 +974,14 @@ void Controller::SetInputFontWeight( FontWeight weight ) if( NULL != mImpl->mEventData ) { mImpl->mEventData->mInputStyle.weight = weight; - mImpl->mEventData->mInputStyle.weightDefined = true; + mImpl->mEventData->mInputStyle.isWeightDefined = true; if( EventData::SELECTING == mImpl->mEventData->mState ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel, + mImpl->mModel->mLogicalModel, startOfSelectedText, lengthOfSelectedText ); @@ -1000,7 +1019,7 @@ bool Controller::IsInputFontWeightDefined() const if( NULL != mImpl->mEventData ) { - defined = mImpl->mEventData->mInputStyle.weightDefined; + defined = mImpl->mEventData->mInputStyle.isWeightDefined; } return defined; @@ -1021,14 +1040,14 @@ void Controller::SetInputFontWidth( FontWidth width ) if( NULL != mImpl->mEventData ) { mImpl->mEventData->mInputStyle.width = width; - mImpl->mEventData->mInputStyle.widthDefined = true; + mImpl->mEventData->mInputStyle.isWidthDefined = true; if( EventData::SELECTING == mImpl->mEventData->mState ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel, + mImpl->mModel->mLogicalModel, startOfSelectedText, lengthOfSelectedText ); @@ -1066,7 +1085,7 @@ bool Controller::IsInputFontWidthDefined() const if( NULL != mImpl->mEventData ) { - defined = mImpl->mEventData->mInputStyle.widthDefined; + defined = mImpl->mEventData->mInputStyle.isWidthDefined; } return defined; @@ -1087,14 +1106,14 @@ void Controller::SetInputFontSlant( FontSlant slant ) if( NULL != mImpl->mEventData ) { mImpl->mEventData->mInputStyle.slant = slant; - mImpl->mEventData->mInputStyle.slantDefined = true; + mImpl->mEventData->mInputStyle.isSlantDefined = true; if( EventData::SELECTING == mImpl->mEventData->mState ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel, + mImpl->mModel->mLogicalModel, startOfSelectedText, lengthOfSelectedText ); @@ -1132,7 +1151,7 @@ bool Controller::IsInputFontSlantDefined() const if( NULL != mImpl->mEventData ) { - defined = mImpl->mEventData->mInputStyle.slantDefined; + defined = mImpl->mEventData->mInputStyle.isSlantDefined; } return defined; @@ -1153,13 +1172,14 @@ void Controller::SetInputFontPointSize( float size ) if( NULL != mImpl->mEventData ) { mImpl->mEventData->mInputStyle.size = size; + mImpl->mEventData->mInputStyle.isSizeDefined = true; if( EventData::SELECTING == mImpl->mEventData->mState ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mLogicalModel, + mImpl->mModel->mLogicalModel, startOfSelectedText, lengthOfSelectedText ); @@ -1207,6 +1227,7 @@ void Controller::SetInputLineSpacing( float lineSpacing ) if( NULL != mImpl->mEventData ) { mImpl->mEventData->mInputStyle.lineSpacing = lineSpacing; + mImpl->mEventData->mInputStyle.isLineSpacingDefined = true; } } @@ -1235,7 +1256,7 @@ const std::string& Controller::GetInputShadowProperties() const return mImpl->mEventData->mInputStyle.shadowProperties; } - return GetDefaultShadowProperties(); + return EMPTY_STRING; } void Controller::SetInputUnderlineProperties( const std::string& underlineProperties ) @@ -1253,7 +1274,7 @@ const std::string& Controller::GetInputUnderlineProperties() const return mImpl->mEventData->mInputStyle.underlineProperties; } - return GetDefaultUnderlineProperties(); + return EMPTY_STRING; } void Controller::SetInputEmbossProperties( const std::string& embossProperties ) @@ -1292,40 +1313,38 @@ const std::string& Controller::GetInputOutlineProperties() const return GetDefaultOutlineProperties(); } -void Controller::SetEnableCursorBlink( bool enable ) +void Controller::SetInputModePassword( bool passwordInput ) { - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" ); - if( NULL != mImpl->mEventData ) { - mImpl->mEventData->mCursorBlinkEnabled = enable; - - if( !enable && - mImpl->mEventData->mDecorator ) - { - mImpl->mEventData->mDecorator->StopCursorBlink(); - } + mImpl->mEventData->mPasswordInput = passwordInput; } } -bool Controller::GetEnableCursorBlink() const +bool Controller::IsInputModePassword() { if( NULL != mImpl->mEventData ) { - return mImpl->mEventData->mCursorBlinkEnabled; + return mImpl->mEventData->mPasswordInput; } - return false; } -const Vector2& Controller::GetScrollPosition() const +// public : Queries & retrieves. + +Layout::Engine& Controller::GetLayoutEngine() { - return mImpl->mScrollPosition; + return mImpl->mLayoutEngine; } -Vector3 Controller::GetNaturalSize() +View& Controller::GetView() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n" ); + return mImpl->mView; +} + +Vector3 Controller::GetNaturalSize() +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n" ); Vector3 naturalSize; // Make sure the model is up-to-date before layouting @@ -1342,18 +1361,19 @@ Vector3 Controller::GetNaturalSize() BIDI_INFO | SHAPE_TEXT | GET_GLYPH_METRICS ); + + // Set the update info to relayout the whole text. + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); + // Make sure the model is up-to-date before layouting mImpl->UpdateModel( onlyOnceOperations ); // Layout the text for the new width. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT ); - // Set the update info to relayout the whole text. - mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; - mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); - // Store the actual control's size to restore later. - const Size actualControlSize = mImpl->mVisualModel->mControlSize; + const Size actualControlSize = mImpl->mModel->mVisualModel->mControlSize; DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), static_cast( onlyOnceOperations | @@ -1371,7 +1391,7 @@ Vector3 Controller::GetNaturalSize() // Stores the natural size to avoid recalculate it again // unless the text/style changes. - mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() ); + mImpl->mModel->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() ); mImpl->mRecalculateNaturalSize = false; @@ -1379,13 +1399,13 @@ Vector3 Controller::GetNaturalSize() mImpl->mTextUpdateInfo.Clear(); // Restore the actual control's size. - mImpl->mVisualModel->mControlSize = actualControlSize; + mImpl->mModel->mVisualModel->mControlSize = actualControlSize; DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); } else { - naturalSize = mImpl->mVisualModel->GetNaturalSize(); + naturalSize = mImpl->mModel->mVisualModel->GetNaturalSize(); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); } @@ -1403,7 +1423,7 @@ float Controller::GetHeightForWidth( float width ) ProcessModifyEvents(); Size layoutSize; - if( fabsf( width - mImpl->mVisualModel->mControlSize.width ) > Math::MACHINE_EPSILON_1000 ) + if( fabsf( width - mImpl->mModel->mVisualModel->mControlSize.width ) > Math::MACHINE_EPSILON_1000 ) { // Operations that can be done only once until the text changes. const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | @@ -1414,6 +1434,11 @@ float Controller::GetHeightForWidth( float width ) BIDI_INFO | SHAPE_TEXT | GET_GLYPH_METRICS ); + + // Set the update info to relayout the whole text. + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); + // Make sure the model is up-to-date before layouting mImpl->UpdateModel( onlyOnceOperations ); @@ -1421,12 +1446,8 @@ float Controller::GetHeightForWidth( float width ) // Layout the text for the new width. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT ); - // Set the update info to relayout the whole text. - mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; - mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); - // Store the actual control's width. - const float actualControlWidth = mImpl->mVisualModel->mControlSize.width; + const float actualControlWidth = mImpl->mModel->mVisualModel->mControlSize.width; DoRelayout( Size( width, MAX_FLOAT ), static_cast( onlyOnceOperations | @@ -1447,30 +1468,61 @@ float Controller::GetHeightForWidth( float width ) mImpl->mTextUpdateInfo.Clear(); // Restore the actual control's width. - mImpl->mVisualModel->mControlSize.width = actualControlWidth; + mImpl->mModel->mVisualModel->mControlSize.width = actualControlWidth; DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height ); } else { - layoutSize = mImpl->mVisualModel->GetLayoutSize(); + layoutSize = mImpl->mModel->mVisualModel->GetLayoutSize(); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height ); } return layoutSize.height; } +const ModelInterface* const Controller::GetTextModel() const +{ + return mImpl->mModel.Get(); +} + +float Controller::GetScrollAmountByUserInput() +{ + float scrollAmount = 0.0f; + + if (NULL != mImpl->mEventData && mImpl->mEventData->mCheckScrollAmount) + { + scrollAmount = mImpl->mModel->mScrollPosition.y - mImpl->mModel->mScrollPositionLast.y; + mImpl->mEventData->mCheckScrollAmount = false; + } + return scrollAmount; +} + +bool Controller::GetTextScrollInfo( float& scrollPosition, float& controlHeight, float& layoutHeight ) +{ + const Vector2& layout = mImpl->mModel->mVisualModel->GetLayoutSize(); + bool isScrolled; + + controlHeight = mImpl->mModel->mVisualModel->mControlSize.height; + layoutHeight = layout.height; + scrollPosition = mImpl->mModel->mScrollPosition.y; + isScrolled = !Equals( mImpl->mModel->mScrollPosition.y, mImpl->mModel->mScrollPositionLast.y, Math::MACHINE_EPSILON_1 ); + return isScrolled; +} + +// public : Relayout. + Controller::UpdateTextType Controller::Relayout( const Size& size ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", this, size.width, size.height, (mImpl->mAutoScrollEnabled)?"true":"false" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", this, size.width, size.height, mImpl->mIsAutoScrollEnabled ?"true":"false" ); UpdateTextType updateTextType = NONE_UPDATED; if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { - if( 0u != mImpl->mVisualModel->mGlyphPositions.Count() ) + if( 0u != mImpl->mModel->mVisualModel->mGlyphPositions.Count() ) { - mImpl->mVisualModel->mGlyphPositions.Clear(); + mImpl->mModel->mVisualModel->mGlyphPositions.Clear(); updateTextType = MODEL_UPDATED; } @@ -1484,11 +1536,11 @@ Controller::UpdateTextType Controller::Relayout( const Size& size ) } // Whether a new size has been set. - const bool newSize = ( size != mImpl->mVisualModel->mControlSize ); + const bool newSize = ( size != mImpl->mModel->mVisualModel->mControlSize ); if( newSize ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mVisualModel->mControlSize.width, mImpl->mVisualModel->mControlSize.height ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mModel->mVisualModel->mControlSize.width, mImpl->mModel->mVisualModel->mControlSize.height ); // Layout operations that need to be done if the size changes. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -1499,6 +1551,9 @@ Controller::UpdateTextType Controller::Relayout( const Size& size ) // Set the update info to relayout the whole text. mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + + // Store the size used to layout the text. + mImpl->mModel->mVisualModel->mControlSize = size; } // Whether there are modify events. @@ -1526,6 +1581,7 @@ Controller::UpdateTextType Controller::Relayout( const Size& size ) // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; + mImpl->mModel->mScrollPositionLast = mImpl->mModel->mScrollPosition; // Whether the text control is editable const bool isEditable = NULL != mImpl->mEventData; @@ -1534,7 +1590,7 @@ Controller::UpdateTextType Controller::Relayout( const Size& size ) Vector2 offset; if( newSize && isEditable ) { - offset = mImpl->mScrollPosition; + offset = mImpl->mModel->mScrollPosition; } if( !isEditable || !IsMultiLineEnabled() ) @@ -1551,7 +1607,7 @@ Controller::UpdateTextType Controller::Relayout( const Size& size ) mImpl->ClampHorizontalScroll( layoutSize ); // Update the decorator's positions is needed if there is a new size. - mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mScrollPosition - offset ); + mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mModel->mScrollPosition - offset ); } // Move the cursor, grab handle etc. @@ -1568,544 +1624,606 @@ Controller::UpdateTextType Controller::Relayout( const Size& size ) return updateTextType; } -void Controller::ProcessModifyEvents() +void Controller::RequestRelayout() { - Vector& events = mImpl->mModifyEvents; + mImpl->RequestRelayout(); +} - if( 0u == events.Count() ) +// public : Input style change signals. + +bool Controller::IsInputStyleChangedSignalsQueueEmpty() +{ + return ( NULL == mImpl->mEventData ) || ( 0u == mImpl->mEventData->mInputStyleChangedQueue.Count() ); +} + +void Controller::ProcessInputStyleChangedSignals() +{ + if( NULL == mImpl->mEventData ) { // Nothing to do. return; } - for( Vector::ConstIterator it = events.Begin(), - endIt = events.End(); + for( Vector::ConstIterator it = mImpl->mEventData->mInputStyleChangedQueue.Begin(), + endIt = mImpl->mEventData->mInputStyleChangedQueue.End(); it != endIt; ++it ) { - const ModifyEvent& event = *it; - - if( ModifyEvent::TEXT_REPLACED == event.type ) - { - // A (single) replace event should come first, otherwise we wasted time processing NOOP events - DALI_ASSERT_DEBUG( it == events.Begin() && "Unexpected TEXT_REPLACED event" ); + const InputStyle::Mask mask = *it; - TextReplacedEvent(); - } - else if( ModifyEvent::TEXT_INSERTED == event.type ) - { - TextInsertedEvent(); - } - else if( ModifyEvent::TEXT_DELETED == event.type ) + if( NULL != mImpl->mEditableControlInterface ) { - // Placeholder-text cannot be deleted - if( !mImpl->IsShowingPlaceholderText() ) - { - TextDeletedEvent(); - } + // Emit the input style changed signal. + mImpl->mEditableControlInterface->InputStyleChanged( mask ); } } - if( NULL != mImpl->mEventData ) - { - // When the text is being modified, delay cursor blinking - mImpl->mEventData->mDecorator->DelayCursorBlink(); - } - - // Discard temporary text - events.Clear(); + mImpl->mEventData->mInputStyleChangedQueue.Clear(); } -void Controller::ResetText() -{ - // Reset buffers. - mImpl->mLogicalModel->mText.Clear(); - - // We have cleared everything including the placeholder-text - mImpl->PlaceholderCleared(); - - mImpl->mTextUpdateInfo.mCharacterIndex = 0u; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = 0u; - - // Clear any previous text. - mImpl->mTextUpdateInfo.mClearAll = true; - - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; - - // Apply modifications to the model - mImpl->mOperationsPending = ALL_OPERATIONS; -} +// public : Text-input Event Queuing. -void Controller::ResetCursorPosition( CharacterIndex cursorIndex ) +void Controller::KeyboardFocusGainEvent() { - // Reset the cursor position + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); + if( NULL != mImpl->mEventData ) { - mImpl->mEventData->mPrimaryCursorPosition = cursorIndex; - - // Update the cursor if it's in editing mode. - if( EventData::IsEditingState( mImpl->mEventData->mState ) ) + if( ( EventData::INACTIVE == mImpl->mEventData->mState ) || + ( EventData::INTERRUPTED == mImpl->mEventData->mState ) ) { - mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->ChangeState( EventData::EDITING ); + mImpl->mEventData->mUpdateCursorPosition = true; //If editing started without tap event, cursor update must be triggered. + mImpl->mEventData->mUpdateInputStyle = true; + } + mImpl->NotifyImfMultiLineStatus(); + if( mImpl->IsShowingPlaceholderText() ) + { + // Show alternative placeholder-text when editing + ShowPlaceholderText(); } + + mImpl->RequestRelayout(); } } -void Controller::ResetScrollPosition() +void Controller::KeyboardFocusLostEvent() { + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); + if( NULL != mImpl->mEventData ) { - // Reset the scroll position. - mImpl->mScrollPosition = Vector2::ZERO; - mImpl->mEventData->mScrollAfterUpdatePosition = true; + if( EventData::INTERRUPTED != mImpl->mEventData->mState ) + { + mImpl->ChangeState( EventData::INACTIVE ); + + if( !mImpl->IsShowingRealText() ) + { + // Revert to regular placeholder-text when not editing + ShowPlaceholderText(); + } + } } + mImpl->RequestRelayout(); } -void Controller::TextReplacedEvent() +bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; - - // Apply modifications to the model - mImpl->mOperationsPending = ALL_OPERATIONS; -} + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); -void Controller::TextInsertedEvent() -{ - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" ); + bool textChanged( false ); - if( NULL == mImpl->mEventData ) + if( ( NULL != mImpl->mEventData ) && + ( keyEvent.state == KeyEvent::Down ) ) { - return; - } + int keyCode = keyEvent.keyCode; + const std::string& keyString = keyEvent.keyPressed; - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; + const bool isNullKey = ( 0 == keyCode ) && ( keyString.empty() ); - // Apply modifications to the model; TODO - Optimize this - mImpl->mOperationsPending = ALL_OPERATIONS; -} + // Pre-process to separate modifying events from non-modifying input events. + if( isNullKey ) + { + // In some platforms arrive key events with no key code. + // Do nothing. + } + else if( Dali::DALI_KEY_ESCAPE == keyCode ) + { + // Escape key is a special case which causes focus loss + KeyboardFocusLostEvent(); + } + else if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) || + ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) || + ( Dali::DALI_KEY_CURSOR_UP == keyCode ) || + ( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) ) + { + // If don't have any text, do nothing. + if( !mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters ) + { + return false; + } -void Controller::TextDeletedEvent() -{ - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" ); + uint32_t cursorPosition = mImpl->mEventData->mPrimaryCursorPosition; + uint32_t numberOfCharacters = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + uint32_t cursorLine = mImpl->mModel->mVisualModel->GetLineOfCharacter( cursorPosition ); + uint32_t numberOfLines = mImpl->mModel->GetNumberOfLines(); + + // Logic to determine whether this text control will lose focus or not. + if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode && 0 == cursorPosition ) || + ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode && numberOfCharacters == cursorPosition) || + ( Dali::DALI_KEY_CURSOR_DOWN == keyCode && cursorLine == numberOfLines -1 ) || + ( Dali::DALI_KEY_CURSOR_DOWN == keyCode && numberOfCharacters == cursorPosition && cursorLine -1 == numberOfLines -1 ) || + ( Dali::DALI_KEY_CURSOR_UP == keyCode && cursorLine == 0 ) || + ( Dali::DALI_KEY_CURSOR_UP == keyCode && numberOfCharacters == cursorPosition && cursorLine == 1 ) ) + { + return false; + } - if( NULL == mImpl->mEventData ) - { - return; - } + mImpl->mEventData->mCheckScrollAmount = true; + Event event( Event::CURSOR_KEY_EVENT ); + event.p1.mInt = keyCode; + mImpl->mEventData->mEventQueue.push_back( event ); + } + else if( Dali::DALI_KEY_BACKSPACE == keyCode ) + { + textChanged = BackspaceKeyEvent(); + } + else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) || + IsKey( keyEvent, Dali::DALI_KEY_MENU ) || + IsKey( keyEvent, Dali::DALI_KEY_HOME ) ) + { + // Power key/Menu/Home key behaviour does not allow edit mode to resume. + mImpl->ChangeState( EventData::INACTIVE ); - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; + // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text. + } + else if( Dali::DALI_KEY_SHIFT_LEFT == keyCode ) + { + // DALI_KEY_SHIFT_LEFT is the key code for the Left Shift. It's sent (by the imf?) when the predictive text is enabled + // and a character is typed after the type of a upper case latin character. - // Apply modifications to the model; TODO - Optimize this - mImpl->mOperationsPending = ALL_OPERATIONS; -} + // Do nothing. + } + else + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() ); -bool Controller::DoRelayout( const Size& size, - OperationsMask operationsRequired, - Size& layoutSize ) -{ - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout %p size %f,%f\n", this, size.width, size.height ); - bool viewUpdated( false ); + // IMF manager is no longer handling key-events + mImpl->ClearPreEditFlag(); - // Calculate the operations to be done. - const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); + InsertText( keyString, COMMIT ); + textChanged = true; + } - const CharacterIndex startIndex = mImpl->mTextUpdateInfo.mParagraphCharacterIndex; - const Length requestedNumberOfCharacters = mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters; + if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && + ( mImpl->mEventData->mState != EventData::INACTIVE ) && + ( !isNullKey ) && + ( Dali::DALI_KEY_SHIFT_LEFT != keyCode ) ) + { + // Should not change the state if the key is the shift send by the imf manager. + // Otherwise, when the state is SELECTING the text controller can't send the right + // surrounding info to the imf. + mImpl->ChangeState( EventData::EDITING ); + } - // Get the current layout size. - layoutSize = mImpl->mVisualModel->GetLayoutSize(); + mImpl->RequestRelayout(); + } - if( NO_OPERATION != ( LAYOUT & operations ) ) + if( textChanged && + ( NULL != mImpl->mEditableControlInterface ) ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n"); + // Do this last since it provides callbacks into application code + mImpl->mEditableControlInterface->TextChanged(); + } - // Some vectors with data needed to layout and reorder may be void - // after the first time the text has been laid out. - // Fill the vectors again. + return true; +} - // Calculate the number of glyphs to layout. - const Vector& charactersToGlyph = mImpl->mVisualModel->mCharactersToGlyph; - const Vector& glyphsPerCharacter = mImpl->mVisualModel->mGlyphsPerCharacter; - const GlyphIndex* const charactersToGlyphBuffer = charactersToGlyph.Begin(); - const Length* const glyphsPerCharacterBuffer = glyphsPerCharacter.Begin(); +void Controller::TapEvent( unsigned int tapCount, float x, float y ) +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" ); - const CharacterIndex lastIndex = startIndex + ( ( requestedNumberOfCharacters > 0u ) ? requestedNumberOfCharacters - 1u : 0u ); - const GlyphIndex startGlyphIndex = mImpl->mTextUpdateInfo.mStartGlyphIndex; - const Length numberOfGlyphs = ( requestedNumberOfCharacters > 0u ) ? *( charactersToGlyphBuffer + lastIndex ) + *( glyphsPerCharacterBuffer + lastIndex ) - startGlyphIndex : 0u; - const Length totalNumberOfGlyphs = mImpl->mVisualModel->mGlyphs.Count(); + if( NULL != mImpl->mEventData ) + { + DALI_LOG_INFO( gLogFilter, Debug::Concise, "TapEvent state:%d \n", mImpl->mEventData->mState ); + EventData::State state( mImpl->mEventData->mState ); + bool relayoutNeeded( false ); // to avoid unnecessary relayouts when tapping an empty text-field - if( 0u == totalNumberOfGlyphs ) + if( mImpl->IsClipboardVisible() ) { - if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) ) + if( EventData::INACTIVE == state || EventData::EDITING == state) { - mImpl->mVisualModel->SetLayoutSize( Size::ZERO ); + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); } - - // Nothing else to do if there is no glyphs. - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n" ); - return true; + relayoutNeeded = true; } - - const Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; - const Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; - const Vector& characterDirection = mImpl->mLogicalModel->mCharacterDirections; - const Vector& glyphs = mImpl->mVisualModel->mGlyphs; - const Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; - const Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; - const Character* const textBuffer = mImpl->mLogicalModel->mText.Begin(); - - // Set the layout parameters. - LayoutParameters layoutParameters( size, - textBuffer, - lineBreakInfo.Begin(), - wordBreakInfo.Begin(), - ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, - glyphs.Begin(), - glyphsToCharactersMap.Begin(), - charactersPerGlyph.Begin(), - charactersToGlyphBuffer, - glyphsPerCharacterBuffer, - totalNumberOfGlyphs ); - - // Resize the vector of positions to have the same size than the vector of glyphs. - Vector& glyphPositions = mImpl->mVisualModel->mGlyphPositions; - glyphPositions.Resize( totalNumberOfGlyphs ); - - // Whether the last character is a new paragraph character. - mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph = TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mLogicalModel->mText.Count() - 1u ) ) ); - layoutParameters.isLastNewParagraph = mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph; - - // The initial glyph and the number of glyphs to layout. - layoutParameters.startGlyphIndex = startGlyphIndex; - layoutParameters.numberOfGlyphs = numberOfGlyphs; - layoutParameters.startLineIndex = mImpl->mTextUpdateInfo.mStartLineIndex; - layoutParameters.estimatedNumberOfLines = mImpl->mTextUpdateInfo.mEstimatedNumberOfLines; - - // Update the visual model. - Size newLayoutSize; - viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, - glyphPositions, - mImpl->mVisualModel->mLines, - newLayoutSize ); - - viewUpdated = viewUpdated || ( newLayoutSize != layoutSize ); - - if( viewUpdated ) + else if( 1u == tapCount ) { - layoutSize = newLayoutSize; - - if ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) + if( EventData::EDITING_WITH_POPUP == state || EventData::EDITING_WITH_PASTE_POPUP == state ) { - mImpl->mAutoScrollDirectionRTL = false; + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); // If Popup shown hide it here so can be shown again if required. } - // Reorder the lines - if( NO_OPERATION != ( REORDER & operations ) ) + if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != state ) ) { - Vector& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo; - Vector& bidirectionalLineInfo = mImpl->mLogicalModel->mBidirectionalLineInfo; - - // Check first if there are paragraphs with bidirectional info. - if( 0u != bidirectionalInfo.Count() ) + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); + relayoutNeeded = true; + } + else + { + if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() ) { - // Get the lines - const Length numberOfLines = mImpl->mVisualModel->mLines.Count(); - - // Reorder the lines. - bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters. - ReorderLines( bidirectionalInfo, - startIndex, - requestedNumberOfCharacters, - mImpl->mVisualModel->mLines, - bidirectionalLineInfo ); - - // Set the bidirectional info per line into the layout parameters. - layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin(); - layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count(); - - // Re-layout the text. Reorder those lines with right to left characters. - mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters, - startIndex, - requestedNumberOfCharacters, - glyphPositions ); - - if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && ( numberOfLines > 0 ) ) - { - const LineRun* const firstline = mImpl->mVisualModel->mLines.Begin(); - if ( firstline ) - { - mImpl->mAutoScrollDirectionRTL = firstline->direction; - } - } + // Hide placeholder text + ResetText(); } - } // REORDER - // Sets the layout size. - if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) ) + if( EventData::INACTIVE == state ) + { + mImpl->ChangeState( EventData::EDITING ); + } + else if( !mImpl->IsClipboardEmpty() ) + { + mImpl->ChangeState( EventData::EDITING_WITH_POPUP ); + } + relayoutNeeded = true; + } + } + else if( 2u == tapCount ) + { + if( mImpl->mEventData->mSelectionEnabled && + mImpl->IsShowingRealText() ) { - mImpl->mVisualModel->SetLayoutSize( layoutSize ); + SelectEvent( x, y, false ); } - } // view updated + } + // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated + if( relayoutNeeded ) + { + Event event( Event::TAP_EVENT ); + event.p1.mUint = tapCount; + event.p2.mFloat = x; + event.p3.mFloat = y; + mImpl->mEventData->mEventQueue.push_back( event ); - // Store the size used to layout the text. - mImpl->mVisualModel->mControlSize = size; + mImpl->RequestRelayout(); + } } - if( NO_OPERATION != ( ALIGN & operations ) ) - { - // The laid-out lines. - Vector& lines = mImpl->mVisualModel->mLines; - - mImpl->mLayoutEngine.Align( size, - startIndex, - requestedNumberOfCharacters, - lines ); - - viewUpdated = true; - } -#if defined(DEBUG_ENABLED) - std::string currentText; - GetText( currentText ); - DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mAutoScrollDirectionRTL[%s] [%s]\n", this, (mImpl->mAutoScrollDirectionRTL)?"true":"false", currentText.c_str() ); -#endif - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); - return viewUpdated; + // Reset keyboard as tap event has occurred. + mImpl->ResetImfManager(); } -void Controller::SetMultiLineEnabled( bool enable ) +void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) { - const LayoutEngine::Layout layout = enable ? LayoutEngine::MULTI_LINE_BOX : LayoutEngine::SINGLE_LINE_BOX; + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); - if( layout != mImpl->mLayoutEngine.GetLayout() ) + if( NULL != mImpl->mEventData ) { - // Set the layout type. - mImpl->mLayoutEngine.SetLayout( layout ); - - // Set the flags to redo the layout operations - const OperationsMask layoutOperations = static_cast( LAYOUT | - UPDATE_LAYOUT_SIZE | - ALIGN | - REORDER ); - - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | layoutOperations ); + Event event( Event::PAN_EVENT ); + event.p1.mInt = state; + event.p2.mFloat = displacement.x; + event.p3.mFloat = displacement.y; + mImpl->mEventData->mEventQueue.push_back( event ); mImpl->RequestRelayout(); } } -bool Controller::IsMultiLineEnabled() const +void Controller::LongPressEvent( Gesture::State state, float x, float y ) { - return LayoutEngine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout(); -} + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" ); -void Controller::SetHorizontalAlignment( LayoutEngine::HorizontalAlignment alignment ) -{ - if( alignment != mImpl->mLayoutEngine.GetHorizontalAlignment() ) + if( ( state == Gesture::Started ) && + ( NULL != mImpl->mEventData ) ) { - // Set the alignment. - mImpl->mLayoutEngine.SetHorizontalAlignment( alignment ); - - // Set the flag to redo the alignment operation. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); - - mImpl->RequestRelayout(); - } -} - -LayoutEngine::HorizontalAlignment Controller::GetHorizontalAlignment() const -{ - return mImpl->mLayoutEngine.GetHorizontalAlignment(); -} + if( !mImpl->IsShowingRealText() ) + { + Event event( Event::LONG_PRESS_EVENT ); + event.p1.mInt = state; + mImpl->mEventData->mEventQueue.push_back( event ); + mImpl->RequestRelayout(); + } + else + { + // The 1st long-press on inactive text-field is treated as tap + if( EventData::INACTIVE == mImpl->mEventData->mState ) + { + mImpl->ChangeState( EventData::EDITING ); -void Controller::SetVerticalAlignment( LayoutEngine::VerticalAlignment alignment ) -{ - if( alignment != mImpl->mLayoutEngine.GetVerticalAlignment() ) - { - // Set the alignment. - mImpl->mLayoutEngine.SetVerticalAlignment( alignment ); + Event event( Event::TAP_EVENT ); + event.p1.mUint = 1; + event.p2.mFloat = x; + event.p3.mFloat = y; + mImpl->mEventData->mEventQueue.push_back( event ); - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); + mImpl->RequestRelayout(); + } + else + { + // Reset the imf manger to commit the pre-edit before selecting the text. + mImpl->ResetImfManager(); - mImpl->RequestRelayout(); + SelectEvent( x, y, false ); + } + } } } -LayoutEngine::VerticalAlignment Controller::GetVerticalAlignment() const -{ - return mImpl->mLayoutEngine.GetVerticalAlignment(); -} - -void Controller::CalculateVerticalOffset( const Size& controlSize ) +ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) { - Size layoutSize = mImpl->mVisualModel->GetLayoutSize(); + // Whether the text needs to be relaid-out. + bool requestRelayout = false; - if( fabsf( layoutSize.height ) < Math::MACHINE_EPSILON_1000 ) - { - // Get the line height of the default font. - layoutSize.height = mImpl->GetDefaultFontLineHeight(); - } + // Whether to retrieve the text and cursor position to be sent to the IMF manager. + bool retrieveText = false; + bool retrieveCursor = false; - switch( mImpl->mLayoutEngine.GetVerticalAlignment() ) + switch( imfEvent.eventName ) { - case LayoutEngine::VERTICAL_ALIGN_TOP: + case ImfManager::COMMIT: + { + InsertText( imfEvent.predictiveString, Text::Controller::COMMIT ); + requestRelayout = true; + retrieveCursor = true; + break; + } + case ImfManager::PREEDIT: + { + InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT ); + requestRelayout = true; + retrieveCursor = true; + break; + } + case ImfManager::DELETESURROUNDING: { - mImpl->mScrollPosition.y = 0.f; + const bool textDeleted = RemoveText( imfEvent.cursorOffset, + imfEvent.numberOfChars, + DONT_UPDATE_INPUT_STYLE ); + + if( textDeleted ) + { + if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) || + !mImpl->IsPlaceholderAvailable() ) + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + else + { + ShowPlaceholderText(); + } + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; + + requestRelayout = true; + } break; } - case LayoutEngine::VERTICAL_ALIGN_CENTER: + case ImfManager::GETSURROUNDING: { - mImpl->mScrollPosition.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment. + retrieveText = true; + retrieveCursor = true; break; } - case LayoutEngine::VERTICAL_ALIGN_BOTTOM: + case ImfManager::VOID: { - mImpl->mScrollPosition.y = controlSize.height - layoutSize.height; + // do nothing break; } + } // end switch + + if( requestRelayout ) + { + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->RequestRelayout(); } -} -LayoutEngine& Controller::GetLayoutEngine() -{ - return mImpl->mLayoutEngine; -} + std::string text; + CharacterIndex cursorPosition = 0u; + Length numberOfWhiteSpaces = 0u; -View& Controller::GetView() -{ - return mImpl->mView; -} + if( retrieveCursor ) + { + numberOfWhiteSpaces = mImpl->GetNumberOfWhiteSpaces( 0u ); -void Controller::KeyboardFocusGainEvent() -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); + cursorPosition = mImpl->GetLogicalCursorPosition(); - if( NULL != mImpl->mEventData ) - { - if( ( EventData::INACTIVE == mImpl->mEventData->mState ) || - ( EventData::INTERRUPTED == mImpl->mEventData->mState ) ) + if( cursorPosition < numberOfWhiteSpaces ) { - mImpl->ChangeState( EventData::EDITING ); - mImpl->mEventData->mUpdateCursorPosition = true; //If editing started without tap event, cursor update must be triggered. + cursorPosition = 0u; } - - if( mImpl->IsShowingPlaceholderText() ) + else { - // Show alternative placeholder-text when editing - ShowPlaceholderText(); + cursorPosition -= numberOfWhiteSpaces; } + } - mImpl->RequestRelayout(); + if( retrieveText ) + { + mImpl->GetText( numberOfWhiteSpaces, text ); + } + + ImfManager::ImfCallbackData callbackData( ( retrieveText || retrieveCursor ), cursorPosition, text, false ); + + if( requestRelayout && + ( NULL != mImpl->mEditableControlInterface ) ) + { + // Do this last since it provides callbacks into application code + mImpl->mEditableControlInterface->TextChanged(); } + + return callbackData; } -void Controller::KeyboardFocusLostEvent() +void Controller::PasteClipboardItemEvent() { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); + // Retrieve the clipboard contents first + ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); + std::string stringToPaste( notifier.GetContent() ); + + // Commit the current pre-edit text; the contents of the clipboard should be appended + mImpl->ResetImfManager(); + + // Temporary disable hiding clipboard + mImpl->SetClipboardHideEnable( false ); + + // Paste + PasteText( stringToPaste ); + + mImpl->SetClipboardHideEnable( true ); +} + +// protected : Inherit from Text::Decorator::ControllerInterface. + +void Controller::GetTargetSize( Vector2& targetSize ) +{ + targetSize = mImpl->mModel->mVisualModel->mControlSize; +} + +void Controller::AddDecoration( Actor& actor, bool needsClipping ) +{ + if( NULL != mImpl->mEditableControlInterface ) + { + mImpl->mEditableControlInterface->AddDecoration( actor, needsClipping ); + } +} + +void Controller::DecorationEvent( HandleType handleType, HandleState state, float x, float y ) +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" ); if( NULL != mImpl->mEventData ) { - if( EventData::INTERRUPTED != mImpl->mEventData->mState ) + switch( handleType ) { - mImpl->ChangeState( EventData::INACTIVE ); + case GRAB_HANDLE: + { + Event event( Event::GRAB_HANDLE_EVENT ); + event.p1.mUint = state; + event.p2.mFloat = x; + event.p3.mFloat = y; - if( !mImpl->IsShowingRealText() ) + mImpl->mEventData->mEventQueue.push_back( event ); + break; + } + case LEFT_SELECTION_HANDLE: { - // Revert to regular placeholder-text when not editing - ShowPlaceholderText(); + Event event( Event::LEFT_SELECTION_HANDLE_EVENT ); + event.p1.mUint = state; + event.p2.mFloat = x; + event.p3.mFloat = y; + + mImpl->mEventData->mEventQueue.push_back( event ); + break; + } + case RIGHT_SELECTION_HANDLE: + { + Event event( Event::RIGHT_SELECTION_HANDLE_EVENT ); + event.p1.mUint = state; + event.p2.mFloat = x; + event.p3.mFloat = y; + + mImpl->mEventData->mEventQueue.push_back( event ); + break; + } + case LEFT_SELECTION_HANDLE_MARKER: + case RIGHT_SELECTION_HANDLE_MARKER: + { + // Markers do not move the handles. + break; + } + case HANDLE_TYPE_COUNT: + { + DALI_ASSERT_DEBUG( !"Controller::HandleEvent. Unexpected handle type" ); } } + + mImpl->RequestRelayout(); } - mImpl->RequestRelayout(); } -bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); - - bool textChanged( false ); +// protected : Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface. - if( ( NULL != mImpl->mEventData ) && - ( keyEvent.state == KeyEvent::Down ) ) +void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) +{ + if( NULL == mImpl->mEventData ) { - int keyCode = keyEvent.keyCode; - const std::string& keyString = keyEvent.keyPressed; + return; + } - // Pre-process to separate modifying events from non-modifying input events. - if( Dali::DALI_KEY_ESCAPE == keyCode ) - { - // Escape key is a special case which causes focus loss - KeyboardFocusLostEvent(); - } - else if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) || - ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) || - ( Dali::DALI_KEY_CURSOR_UP == keyCode ) || - ( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) ) + switch( button ) + { + case Toolkit::TextSelectionPopup::CUT: { - Event event( Event::CURSOR_KEY_EVENT ); - event.p1.mInt = keyCode; - mImpl->mEventData->mEventQueue.push_back( event ); + mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text + mImpl->mOperationsPending = ALL_OPERATIONS; + + if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) || + !mImpl->IsPlaceholderAvailable() ) + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + else + { + ShowPlaceholderText(); + } + + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; + + mImpl->RequestRelayout(); + + if( NULL != mImpl->mEditableControlInterface ) + { + mImpl->mEditableControlInterface->TextChanged(); + } + break; } - else if( Dali::DALI_KEY_BACKSPACE == keyCode ) + case Toolkit::TextSelectionPopup::COPY: { - textChanged = BackspaceKeyEvent(); + mImpl->SendSelectionToClipboard( false ); // Text not modified + + mImpl->mEventData->mUpdateCursorPosition = true; + + mImpl->RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup + break; } - else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) ) + case Toolkit::TextSelectionPopup::PASTE: { - mImpl->ChangeState( EventData::INTERRUPTED ); // State is not INACTIVE as expect to return to edit mode. - // Avoids calling the InsertText() method which can delete selected text + mImpl->RequestGetTextFromClipboard(); // Request clipboard service to retrieve an item + break; } - else if( IsKey( keyEvent, Dali::DALI_KEY_MENU ) || - IsKey( keyEvent, Dali::DALI_KEY_HOME ) ) + case Toolkit::TextSelectionPopup::SELECT: { - mImpl->ChangeState( EventData::INACTIVE ); - // Menu/Home key behaviour does not allow edit mode to resume like Power key - // Avoids calling the InsertText() method which can delete selected text + const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR ); + + if( mImpl->mEventData->mSelectionEnabled ) + { + // Creates a SELECT event. + SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false ); + } + break; } - else if( Dali::DALI_KEY_SHIFT_LEFT == keyCode ) + case Toolkit::TextSelectionPopup::SELECT_ALL: { - // DALI_KEY_SHIFT_LEFT is the key code for the Left Shift. It's sent (by the imf?) when the predictive text is enabled - // and a character is typed after the type of a upper case latin character. - - // Do nothing. + // Creates a SELECT_ALL event + SelectEvent( 0.f, 0.f, true ); + break; } - else + case Toolkit::TextSelectionPopup::CLIPBOARD: { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() ); - - // IMF manager is no longer handling key-events - mImpl->ClearPreEditFlag(); - - InsertText( keyString, COMMIT ); - textChanged = true; + mImpl->ShowClipboard(); + break; } - - if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && - ( mImpl->mEventData->mState != EventData::INACTIVE ) && - ( Dali::DALI_KEY_SHIFT_LEFT != keyCode ) ) + case Toolkit::TextSelectionPopup::NONE: { - // Should not change the state if the key is the shift send by the imf manager. - // Otherwise, when the state is SELECTING the text controller can't send the right - // surrounding info to the imf. - mImpl->ChangeState( EventData::EDITING ); + // Nothing to do. + break; } - - mImpl->RequestRelayout(); - } - - if( textChanged ) - { - // Do this last since it provides callbacks into application code - mImpl->mControlInterface.TextChanged(); } - - return true; } +// private : Update. + void Controller::InsertText( const std::string& text, Controller::InsertType type ) { bool removedPrevious( false ); @@ -2123,10 +2241,10 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); // TODO: At the moment the underline runs are only for pre-edit. - mImpl->mVisualModel->mUnderlineRuns.Clear(); + mImpl->mModel->mVisualModel->mUnderlineRuns.Clear(); // Keep the current number of characters. - const Length currentNumberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mLogicalModel->mText.Count() : 0u; + const Length currentNumberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mModel->mLogicalModel->mText.Count() : 0u; // Remove the previous IMF pre-edit. if( mImpl->mEventData->mPreEditFlag && ( 0u != mImpl->mEventData->mPreEditLength ) ) @@ -2196,7 +2314,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); } - const Length numberOfCharactersInModel = mImpl->mLogicalModel->mText.Count(); + const Length numberOfCharactersInModel = mImpl->mModel->mLogicalModel->mText.Count(); // Restrict new text to fit within Maximum characters setting. Length maxSizeOfNewText = std::min( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); @@ -2208,7 +2326,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // Update the text's style. // Updates the text style runs by adding characters. - mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText ); + mImpl->mModel->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText ); // Get the character index from the cursor index. const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u; @@ -2216,7 +2334,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // Retrieve the text's style for the given index. InputStyle style; mImpl->RetrieveDefaultInputStyle( style ); - mImpl->mLogicalModel->RetrieveStyle( styleIndex, style ); + mImpl->mModel->mLogicalModel->RetrieveStyle( styleIndex, style ); // Whether to add a new text color run. const bool addColorRun = ( style.textColor != mImpl->mEventData->mInputStyle.textColor ); @@ -2231,10 +2349,10 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // Add style runs. if( addColorRun ) { - const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count(); - mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); + const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mColorRuns.Count(); + mImpl->mModel->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); - ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); + ColorRun& colorRun = *( mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); colorRun.color = mImpl->mEventData->mInputStyle.textColor; colorRun.characterRun.characterIndex = cursorIndex; colorRun.characterRun.numberOfCharacters = maxSizeOfNewText; @@ -2246,10 +2364,10 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ addFontSlantRun || addFontSizeRun ) { - const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mFontDescriptionRuns.Count(); - mImpl->mLogicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); + const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Count(); + mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); - FontDescriptionRun& fontDescriptionRun = *( mImpl->mLogicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); + FontDescriptionRun& fontDescriptionRun = *( mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); if( addFontNameRun ) { @@ -2290,7 +2408,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ } // Insert at current cursor position. - Vector& modifyText = mImpl->mLogicalModel->mText; + Vector& modifyText = mImpl->mModel->mLogicalModel->mText; if( cursorIndex < numberOfCharactersInModel ) { @@ -2308,12 +2426,12 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // Update the cursor index. cursorIndex += maxSizeOfNewText; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mModel->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition ); } - const Length numberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mLogicalModel->mText.Count() : 0u; + const Length numberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mModel->mLogicalModel->mText.Count() : 0u; - if( ( 0u == mImpl->mLogicalModel->mText.Count() ) && + if( ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) && mImpl->IsPlaceholderAvailable() ) { // Show place-holder if empty after removing the pre-edit text @@ -2340,465 +2458,462 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ if( maxLengthReached ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", mImpl->mLogicalModel->mText.Count() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", mImpl->mModel->mLogicalModel->mText.Count() ); mImpl->ResetImfManager(); - // Do this last since it provides callbacks into application code - mImpl->mControlInterface.MaxLengthReached(); + if( NULL != mImpl->mEditableControlInterface ) + { + // Do this last since it provides callbacks into application code + mImpl->mEditableControlInterface->MaxLengthReached(); + } } } -bool Controller::RemoveSelectedText() +void Controller::PasteText( const std::string& stringToPaste ) { - bool textRemoved( false ); + InsertText( stringToPaste, Text::Controller::COMMIT ); + mImpl->ChangeState( EventData::EDITING ); + mImpl->RequestRelayout(); - if( EventData::SELECTING == mImpl->mEventData->mState ) + if( NULL != mImpl->mEditableControlInterface ) { - std::string removedString; - mImpl->RetrieveSelection( removedString, true ); - - if( !removedString.empty() ) - { - textRemoved = true; - mImpl->ChangeState( EventData::EDITING ); - } + // Do this last since it provides callbacks into application code + mImpl->mEditableControlInterface->TextChanged(); } - - return textRemoved; } -void Controller::TapEvent( unsigned int tapCount, float x, float y ) +bool Controller::RemoveText( int cursorOffset, + int numberOfCharacters, + UpdateInputStyleType type ) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" ); + bool removed = false; - if( NULL != mImpl->mEventData ) + if( NULL == mImpl->mEventData ) { - DALI_LOG_INFO( gLogFilter, Debug::Concise, "TapEvent state:%d \n", mImpl->mEventData->mState ); - - if( 1u == tapCount ) - { - // This is to avoid unnecessary relayouts when tapping an empty text-field - bool relayoutNeeded( false ); + return removed; + } - if( ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ) - { - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); // If Popup shown hide it here so can be shown again if required. - } + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfCharacters %d\n", + this, mImpl->mModel->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfCharacters ); - if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != mImpl->mEventData->mState ) ) - { - // Already in an active state so show a popup - if( !mImpl->IsClipboardEmpty() ) - { - // Shows Paste popup but could show full popup with Selection options. ( EDITING_WITH_POPUP ) - mImpl->ChangeState( EventData::EDITING_WITH_PASTE_POPUP ); - } - else - { - // Show cursor and grabhandle on first tap, this matches the behaviour of tapping when already editing - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); - } - relayoutNeeded = true; - } - else - { - if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() ) - { - // Hide placeholder text - ResetText(); - } + if( !mImpl->IsShowingPlaceholderText() ) + { + // Delete at current cursor position + Vector& currentText = mImpl->mModel->mLogicalModel->mText; + CharacterIndex& oldCursorIndex = mImpl->mEventData->mPrimaryCursorPosition; - if( EventData::INACTIVE == mImpl->mEventData->mState ) - { - mImpl->ChangeState( EventData::EDITING ); - } - else if( !mImpl->IsClipboardEmpty() ) - { - mImpl->ChangeState( EventData::EDITING_WITH_POPUP ); - } - relayoutNeeded = true; - } + CharacterIndex cursorIndex = oldCursorIndex; - // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated - if( relayoutNeeded ) - { - Event event( Event::TAP_EVENT ); - event.p1.mUint = tapCount; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); + // Validate the cursor position & number of characters + if( static_cast< CharacterIndex >( std::abs( cursorOffset ) ) <= cursorIndex ) + { + cursorIndex = oldCursorIndex + cursorOffset; + } - mImpl->RequestRelayout(); - } + if( ( cursorIndex + numberOfCharacters ) > currentText.Count() ) + { + numberOfCharacters = currentText.Count() - cursorIndex; } - else if( 2u == tapCount ) + + if( mImpl->mEventData->mPreEditFlag || // If the preedit flag is enabled, it means two (or more) of them came together i.e. when two keys have been pressed at the same time. + ( ( cursorIndex + numberOfCharacters ) <= mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters ) ) { - if( mImpl->mEventData->mSelectionEnabled && - mImpl->IsShowingRealText() ) + // Mark the paragraphs to be updated. + mImpl->mTextUpdateInfo.mCharacterIndex = std::min( cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex ); + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove += numberOfCharacters; + + // Update the input style and remove the text's style before removing the text. + + if( UPDATE_INPUT_STYLE == type ) { - SelectEvent( x, y, false ); - } - } - } + // Keep a copy of the current input style. + InputStyle currentInputStyle; + currentInputStyle.Copy( mImpl->mEventData->mInputStyle ); - // Reset keyboard as tap event has occurred. - mImpl->ResetImfManager(); -} + // Set first the default input style. + mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle ); -void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); + // Update the input style. + mImpl->mModel->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle ); - if( NULL != mImpl->mEventData ) - { - Event event( Event::PAN_EVENT ); - event.p1.mInt = state; - event.p2.mFloat = displacement.x; - event.p3.mFloat = displacement.y; - mImpl->mEventData->mEventQueue.push_back( event ); + // Compare if the input style has changed. + const bool hasInputStyleChanged = !currentInputStyle.Equal( mImpl->mEventData->mInputStyle ); - mImpl->RequestRelayout(); - } -} + if( hasInputStyleChanged ) + { + const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask( mImpl->mEventData->mInputStyle ); + // Queue the input style changed signal. + mImpl->mEventData->mInputStyleChangedQueue.PushBack( styleChangedMask ); + } + } -void Controller::LongPressEvent( Gesture::State state, float x, float y ) -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" ); + // Updates the text style runs by removing characters. Runs with no characters are removed. + mImpl->mModel->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfCharacters ); - if( ( state == Gesture::Started ) && - ( NULL != mImpl->mEventData ) ) - { - if( !mImpl->IsShowingRealText() ) - { - Event event( Event::LONG_PRESS_EVENT ); - event.p1.mInt = state; - mImpl->mEventData->mEventQueue.push_back( event ); - mImpl->RequestRelayout(); - } - else - { - // The 1st long-press on inactive text-field is treated as tap - if( EventData::INACTIVE == mImpl->mEventData->mState ) - { - mImpl->ChangeState( EventData::EDITING ); + // Remove the characters. + Vector::Iterator first = currentText.Begin() + cursorIndex; + Vector::Iterator last = first + numberOfCharacters; - Event event( Event::TAP_EVENT ); - event.p1.mUint = 1; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); + currentText.Erase( first, last ); - mImpl->RequestRelayout(); - } - else - { - // Reset the imf manger to commit the pre-edit before selecting the text. - mImpl->ResetImfManager(); + // Cursor position retreat + oldCursorIndex = cursorIndex; - SelectEvent( x, y, false ); - } + mImpl->mEventData->mScrollAfterDelete = true; + + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters ); + removed = true; } } + + return removed; } -void Controller::SelectEvent( float x, float y, bool selectAll ) +bool Controller::RemoveSelectedText() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" ); + bool textRemoved( false ); - if( NULL != mImpl->mEventData ) + if( EventData::SELECTING == mImpl->mEventData->mState ) { - if( selectAll ) - { - Event event( Event::SELECT_ALL ); - mImpl->mEventData->mEventQueue.push_back( event ); - } - else + std::string removedString; + mImpl->RetrieveSelection( removedString, true ); + + if( !removedString.empty() ) { - Event event( Event::SELECT ); - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); + textRemoved = true; + mImpl->ChangeState( EventData::EDITING ); } - - mImpl->RequestRelayout(); } -} -void Controller::GetTargetSize( Vector2& targetSize ) -{ - targetSize = mImpl->mVisualModel->mControlSize; + return textRemoved; } -void Controller::AddDecoration( Actor& actor, bool needsClipping ) -{ - mImpl->mControlInterface.AddDecoration( actor, needsClipping ); -} +// private : Relayout. -void Controller::DecorationEvent( HandleType handleType, HandleState state, float x, float y ) +bool Controller::DoRelayout( const Size& size, + OperationsMask operationsRequired, + Size& layoutSize ) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout %p size %f,%f\n", this, size.width, size.height ); + bool viewUpdated( false ); - if( NULL != mImpl->mEventData ) + // Calculate the operations to be done. + const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); + + const CharacterIndex startIndex = mImpl->mTextUpdateInfo.mParagraphCharacterIndex; + const Length requestedNumberOfCharacters = mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters; + + // Get the current layout size. + layoutSize = mImpl->mModel->mVisualModel->GetLayoutSize(); + + if( NO_OPERATION != ( LAYOUT & operations ) ) { - switch( handleType ) - { - case GRAB_HANDLE: - { - Event event( Event::GRAB_HANDLE_EVENT ); - event.p1.mUint = state; - event.p2.mFloat = x; - event.p3.mFloat = y; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n"); - mImpl->mEventData->mEventQueue.push_back( event ); - break; - } - case LEFT_SELECTION_HANDLE: - { - Event event( Event::LEFT_SELECTION_HANDLE_EVENT ); - event.p1.mUint = state; - event.p2.mFloat = x; - event.p3.mFloat = y; + // Some vectors with data needed to layout and reorder may be void + // after the first time the text has been laid out. + // Fill the vectors again. - mImpl->mEventData->mEventQueue.push_back( event ); - break; - } - case RIGHT_SELECTION_HANDLE: - { - Event event( Event::RIGHT_SELECTION_HANDLE_EVENT ); - event.p1.mUint = state; - event.p2.mFloat = x; - event.p3.mFloat = y; + // Calculate the number of glyphs to layout. + const Vector& charactersToGlyph = mImpl->mModel->mVisualModel->mCharactersToGlyph; + const Vector& glyphsPerCharacter = mImpl->mModel->mVisualModel->mGlyphsPerCharacter; + const GlyphIndex* const charactersToGlyphBuffer = charactersToGlyph.Begin(); + const Length* const glyphsPerCharacterBuffer = glyphsPerCharacter.Begin(); - mImpl->mEventData->mEventQueue.push_back( event ); - break; - } - case LEFT_SELECTION_HANDLE_MARKER: - case RIGHT_SELECTION_HANDLE_MARKER: - { - // Markers do not move the handles. - break; - } - case HANDLE_TYPE_COUNT: + const CharacterIndex lastIndex = startIndex + ( ( requestedNumberOfCharacters > 0u ) ? requestedNumberOfCharacters - 1u : 0u ); + const GlyphIndex startGlyphIndex = mImpl->mTextUpdateInfo.mStartGlyphIndex; + const Length numberOfGlyphs = ( requestedNumberOfCharacters > 0u ) ? *( charactersToGlyphBuffer + lastIndex ) + *( glyphsPerCharacterBuffer + lastIndex ) - startGlyphIndex : 0u; + const Length totalNumberOfGlyphs = mImpl->mModel->mVisualModel->mGlyphs.Count(); + + if( 0u == totalNumberOfGlyphs ) + { + if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) ) { - DALI_ASSERT_DEBUG( !"Controller::HandleEvent. Unexpected handle type" ); + mImpl->mModel->mVisualModel->SetLayoutSize( Size::ZERO ); } - } - mImpl->RequestRelayout(); - } -} - -void Controller::PasteText( const std::string& stringToPaste ) -{ - InsertText( stringToPaste, Text::Controller::COMMIT ); - mImpl->ChangeState( EventData::EDITING ); - mImpl->RequestRelayout(); + // Nothing else to do if there is no glyphs. + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n" ); + return true; + } - // Do this last since it provides callbacks into application code - mImpl->mControlInterface.TextChanged(); -} + const Vector& lineBreakInfo = mImpl->mModel->mLogicalModel->mLineBreakInfo; + const Vector& wordBreakInfo = mImpl->mModel->mLogicalModel->mWordBreakInfo; + const Vector& characterDirection = mImpl->mModel->mLogicalModel->mCharacterDirections; + const Vector& glyphs = mImpl->mModel->mVisualModel->mGlyphs; + const Vector& glyphsToCharactersMap = mImpl->mModel->mVisualModel->mGlyphsToCharacters; + const Vector& charactersPerGlyph = mImpl->mModel->mVisualModel->mCharactersPerGlyph; + const Character* const textBuffer = mImpl->mModel->mLogicalModel->mText.Begin(); -void Controller::PasteClipboardItemEvent() -{ - // Retrieve the clipboard contents first - ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); - std::string stringToPaste( notifier.GetContent() ); + // Set the layout parameters. + Layout::Parameters layoutParameters( size, + textBuffer, + lineBreakInfo.Begin(), + wordBreakInfo.Begin(), + ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, + glyphs.Begin(), + glyphsToCharactersMap.Begin(), + charactersPerGlyph.Begin(), + charactersToGlyphBuffer, + glyphsPerCharacterBuffer, + totalNumberOfGlyphs, + mImpl->mModel->mHorizontalAlignment ); - // Commit the current pre-edit text; the contents of the clipboard should be appended - mImpl->ResetImfManager(); + // Resize the vector of positions to have the same size than the vector of glyphs. + Vector& glyphPositions = mImpl->mModel->mVisualModel->mGlyphPositions; + glyphPositions.Resize( totalNumberOfGlyphs ); - // Temporary disable hiding clipboard - mImpl->SetClipboardHideEnable( false ); + // Whether the last character is a new paragraph character. + mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph = TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mModel->mLogicalModel->mText.Count() - 1u ) ) ); + layoutParameters.isLastNewParagraph = mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph; - // Paste - PasteText( stringToPaste ); + // The initial glyph and the number of glyphs to layout. + layoutParameters.startGlyphIndex = startGlyphIndex; + layoutParameters.numberOfGlyphs = numberOfGlyphs; + layoutParameters.startLineIndex = mImpl->mTextUpdateInfo.mStartLineIndex; + layoutParameters.estimatedNumberOfLines = mImpl->mTextUpdateInfo.mEstimatedNumberOfLines; - mImpl->SetClipboardHideEnable( true ); -} + // Update the visual model. + Size newLayoutSize; + viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, + glyphPositions, + mImpl->mModel->mVisualModel->mLines, + newLayoutSize, + mImpl->mModel->mElideEnabled ); -void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) -{ - if( NULL == mImpl->mEventData ) - { - return; - } + viewUpdated = viewUpdated || ( newLayoutSize != layoutSize ); - switch( button ) - { - case Toolkit::TextSelectionPopup::CUT: + if( viewUpdated ) { - mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text - mImpl->mOperationsPending = ALL_OPERATIONS; + layoutSize = newLayoutSize; - if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || - !mImpl->IsPlaceholderAvailable() ) + if( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) { - mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + mImpl->mAutoScrollDirectionRTL = false; } - else + + // Reorder the lines + if( NO_OPERATION != ( REORDER & operations ) ) { - ShowPlaceholderText(); + Vector& bidirectionalInfo = mImpl->mModel->mLogicalModel->mBidirectionalParagraphInfo; + Vector& bidirectionalLineInfo = mImpl->mModel->mLogicalModel->mBidirectionalLineInfo; + + // Check first if there are paragraphs with bidirectional info. + if( 0u != bidirectionalInfo.Count() ) + { + // Get the lines + const Length numberOfLines = mImpl->mModel->mVisualModel->mLines.Count(); + + // Reorder the lines. + bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters. + ReorderLines( bidirectionalInfo, + startIndex, + requestedNumberOfCharacters, + mImpl->mModel->mVisualModel->mLines, + bidirectionalLineInfo ); + + // Set the bidirectional info per line into the layout parameters. + layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin(); + layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count(); + + // Re-layout the text. Reorder those lines with right to left characters. + mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters, + startIndex, + requestedNumberOfCharacters, + glyphPositions ); + + if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && ( numberOfLines > 0 ) ) + { + const LineRun* const firstline = mImpl->mModel->mVisualModel->mLines.Begin(); + if ( firstline ) + { + mImpl->mAutoScrollDirectionRTL = firstline->direction; + } + } + } + } // REORDER + + // Sets the layout size. + if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) ) + { + mImpl->mModel->mVisualModel->SetLayoutSize( layoutSize ); } + } // view updated + } - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterDelete = true; + if( NO_OPERATION != ( ALIGN & operations ) ) + { + // The laid-out lines. + Vector& lines = mImpl->mModel->mVisualModel->mLines; - mImpl->RequestRelayout(); - mImpl->mControlInterface.TextChanged(); - break; - } - case Toolkit::TextSelectionPopup::COPY: - { - mImpl->SendSelectionToClipboard( false ); // Text not modified + // Need to align with the control's size as the text may contain lines + // starting either with left to right text or right to left. + mImpl->mLayoutEngine.Align( size, + startIndex, + requestedNumberOfCharacters, + mImpl->mModel->mHorizontalAlignment, + lines, + mImpl->mModel->mAlignmentOffset ); + + viewUpdated = true; + } +#if defined(DEBUG_ENABLED) + std::string currentText; + GetText( currentText ); + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mAutoScrollDirectionRTL[%s] [%s]\n", this, (mImpl->mAutoScrollDirectionRTL)?"true":"false", currentText.c_str() ); +#endif + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); + return viewUpdated; +} - mImpl->mEventData->mUpdateCursorPosition = true; +void Controller::CalculateVerticalOffset( const Size& controlSize ) +{ + Size layoutSize = mImpl->mModel->mVisualModel->GetLayoutSize(); - mImpl->RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup - break; - } - case Toolkit::TextSelectionPopup::PASTE: - { - std::string stringToPaste(""); - mImpl->GetTextFromClipboard( 0, stringToPaste ); // Paste latest item from system clipboard - PasteText( stringToPaste ); - break; - } - case Toolkit::TextSelectionPopup::SELECT: - { - const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR ); + if( fabsf( layoutSize.height ) < Math::MACHINE_EPSILON_1000 ) + { + // Get the line height of the default font. + layoutSize.height = mImpl->GetDefaultFontLineHeight(); + } - if( mImpl->mEventData->mSelectionEnabled ) - { - // Creates a SELECT event. - SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false ); - } - break; - } - case Toolkit::TextSelectionPopup::SELECT_ALL: + switch( mImpl->mModel->mVerticalAlignment ) + { + case Layout::VERTICAL_ALIGN_TOP: { - // Creates a SELECT_ALL event - SelectEvent( 0.f, 0.f, true ); + mImpl->mModel->mScrollPosition.y = 0.f; break; } - case Toolkit::TextSelectionPopup::CLIPBOARD: + case Layout::VERTICAL_ALIGN_CENTER: { - mImpl->ShowClipboard(); + mImpl->mModel->mScrollPosition.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment. break; } - case Toolkit::TextSelectionPopup::NONE: + case Layout::VERTICAL_ALIGN_BOTTOM: { - // Nothing to do. + mImpl->mModel->mScrollPosition.y = controlSize.height - layoutSize.height; break; } } } -ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) +// private : Events. + +void Controller::ProcessModifyEvents() { - // Whether the text needs to be relaid-out. - bool requestRelayout = false; + Vector& events = mImpl->mModifyEvents; - // Whether to retrieve the text and cursor position to be sent to the IMF manager. - bool retrieveText = false; - bool retrieveCursor = false; + if( 0u == events.Count() ) + { + // Nothing to do. + return; + } - switch( imfEvent.eventName ) + for( Vector::ConstIterator it = events.Begin(), + endIt = events.End(); + it != endIt; + ++it ) { - case ImfManager::COMMIT: + const ModifyEvent& event = *it; + + if( ModifyEvent::TEXT_REPLACED == event.type ) { - InsertText( imfEvent.predictiveString, Text::Controller::COMMIT ); - requestRelayout = true; - retrieveCursor = true; - break; + // A (single) replace event should come first, otherwise we wasted time processing NOOP events + DALI_ASSERT_DEBUG( it == events.Begin() && "Unexpected TEXT_REPLACED event" ); + + TextReplacedEvent(); } - case ImfManager::PREEDIT: + else if( ModifyEvent::TEXT_INSERTED == event.type ) { - InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT ); - requestRelayout = true; - retrieveCursor = true; - break; + TextInsertedEvent(); } - case ImfManager::DELETESURROUNDING: + else if( ModifyEvent::TEXT_DELETED == event.type ) { - const bool textDeleted = RemoveText( imfEvent.cursorOffset, - imfEvent.numberOfChars, - DONT_UPDATE_INPUT_STYLE ); - - if( textDeleted ) + // Placeholder-text cannot be deleted + if( !mImpl->IsShowingPlaceholderText() ) { - if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || - !mImpl->IsPlaceholderAvailable() ) - { - mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); - } - else - { - ShowPlaceholderText(); - } - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterDelete = true; - - requestRelayout = true; + TextDeletedEvent(); } - break; - } - case ImfManager::GETSURROUNDING: - { - retrieveText = true; - retrieveCursor = true; - break; } - case ImfManager::VOID: - { - // do nothing - break; - } - } // end switch + } - if( requestRelayout ) + if( NULL != mImpl->mEventData ) { - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->RequestRelayout(); - - // Do this last since it provides callbacks into application code - mImpl->mControlInterface.TextChanged(); + // When the text is being modified, delay cursor blinking + mImpl->mEventData->mDecorator->DelayCursorBlink(); } - std::string text; - CharacterIndex cursorPosition = 0u; - Length numberOfWhiteSpaces = 0u; + // Discard temporary text + events.Clear(); +} - if( retrieveCursor ) - { - numberOfWhiteSpaces = mImpl->GetNumberOfWhiteSpaces( 0u ); +void Controller::TextReplacedEvent() +{ + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; - cursorPosition = mImpl->GetLogicalCursorPosition(); + // Apply modifications to the model + mImpl->mOperationsPending = ALL_OPERATIONS; +} - if( cursorPosition < numberOfWhiteSpaces ) - { - cursorPosition = 0u; - } - else - { - cursorPosition -= numberOfWhiteSpaces; - } +void Controller::TextInsertedEvent() +{ + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" ); + + if( NULL == mImpl->mEventData ) + { + return; } - if( retrieveText ) + mImpl->mEventData->mCheckScrollAmount = true; + + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model; TODO - Optimize this + mImpl->mOperationsPending = ALL_OPERATIONS; +} + +void Controller::TextDeletedEvent() +{ + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" ); + + if( NULL == mImpl->mEventData ) { - mImpl->GetText( numberOfWhiteSpaces, text ); + return; } - ImfManager::ImfCallbackData callbackData( ( retrieveText || retrieveCursor ), cursorPosition, text, false ); + mImpl->mEventData->mCheckScrollAmount = true; - return callbackData; + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model; TODO - Optimize this + mImpl->mOperationsPending = ALL_OPERATIONS; } -Controller::~Controller() +void Controller::SelectEvent( float x, float y, bool selectAll ) { - delete mImpl; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" ); + + if( NULL != mImpl->mEventData ) + { + if( selectAll ) + { + Event event( Event::SELECT_ALL ); + mImpl->mEventData->mEventQueue.push_back( event ); + } + else + { + Event event( Event::SELECT ); + event.p2.mFloat = x; + event.p3.mFloat = y; + mImpl->mEventData->mEventQueue.push_back( event ); + } + + mImpl->mEventData->mCheckScrollAmount = true; + mImpl->RequestRelayout(); + } } bool Controller::BackspaceKeyEvent() @@ -2829,7 +2944,7 @@ bool Controller::BackspaceKeyEvent() if( removed ) { - if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || + if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) || !mImpl->IsPlaceholderAvailable() ) { mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); @@ -2845,6 +2960,30 @@ bool Controller::BackspaceKeyEvent() return removed; } +// private : Helpers. + +void Controller::ResetText() +{ + // Reset buffers. + mImpl->mModel->mLogicalModel->mText.Clear(); + + // We have cleared everything including the placeholder-text + mImpl->PlaceholderCleared(); + + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = 0u; + + // Clear any previous text. + mImpl->mTextUpdateInfo.mClearAll = true; + + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model + mImpl->mOperationsPending = ALL_OPERATIONS; +} + void Controller::ShowPlaceholderText() { if( mImpl->IsPlaceholderAvailable() ) @@ -2883,11 +3022,11 @@ void Controller::ShowPlaceholderText() mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; // Reset model for showing placeholder. - mImpl->mLogicalModel->mText.Clear(); - mImpl->mVisualModel->SetTextColor( mImpl->mEventData->mPlaceholderTextColor ); + mImpl->mModel->mLogicalModel->mText.Clear(); + mImpl->mModel->mVisualModel->SetTextColor( mImpl->mEventData->mPlaceholderTextColor ); // Convert text into UTF-32 - Vector& utf32Characters = mImpl->mLogicalModel->mText; + Vector& utf32Characters = mImpl->mModel->mLogicalModel->mText; utf32Characters.Resize( size ); // This is a bit horrible but std::string returns a (signed) char* @@ -2925,7 +3064,7 @@ void Controller::ClearFontData() // Set flags to update the model. mImpl->mTextUpdateInfo.mCharacterIndex = 0u; mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mLogicalModel->mText.Count(); + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); mImpl->mTextUpdateInfo.mClearAll = true; mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; @@ -2943,14 +3082,62 @@ void Controller::ClearFontData() void Controller::ClearStyleData() { - mImpl->mLogicalModel->mColorRuns.Clear(); - mImpl->mLogicalModel->ClearFontDescriptionRuns(); + mImpl->mModel->mLogicalModel->mColorRuns.Clear(); + mImpl->mModel->mLogicalModel->ClearFontDescriptionRuns(); +} + +void Controller::ResetCursorPosition( CharacterIndex cursorIndex ) +{ + // Reset the cursor position + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mPrimaryCursorPosition = cursorIndex; + + // Update the cursor if it's in editing mode. + if( EventData::IsEditingState( mImpl->mEventData->mState ) ) + { + mImpl->mEventData->mUpdateCursorPosition = true; + } + } +} + +void Controller::ResetScrollPosition() +{ + if( NULL != mImpl->mEventData ) + { + // Reset the scroll position. + mImpl->mModel->mScrollPosition = Vector2::ZERO; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } } -Controller::Controller( ControlInterface& controlInterface ) +// private : Private contructors & copy operator. + +Controller::Controller() : mImpl( NULL ) { - mImpl = new Controller::Impl( controlInterface ); + mImpl = new Controller::Impl( NULL, NULL ); +} + +Controller::Controller( ControlInterface* controlInterface ) +{ + mImpl = new Controller::Impl( controlInterface, NULL ); +} + +Controller::Controller( ControlInterface* controlInterface, + EditableControlInterface* editableControlInterface ) +{ + mImpl = new Controller::Impl( controlInterface, + editableControlInterface ); +} + +// The copy constructor and operator are left unimplemented. + +// protected : Destructor. + +Controller::~Controller() +{ + delete mImpl; } } // namespace Text