X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=153a36ca9f3633d51f7a04b160e4bc0b13b3166d;hb=834452d5624e8c11d8cb3b8a31bdbafe3e47351f;hp=57356d0ef1eb1cc6741ef910d8b7e2c6e1f1b094;hpb=2d2ecb83398d1c811911b8a734fb844a16616636;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 57356d0..153a36c 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -20,33 +20,36 @@ // EXTERNAL INCLUDES #include -#include +#include #include #include +#include // INTERNAL INCLUDES #include #include #include -#include -#include -#include -#include +#include #include -#include -#include namespace { #if defined(DEBUG_ENABLED) - Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS"); + Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS"); #endif const float MAX_FLOAT = std::numeric_limits::max(); +const unsigned int POINTS_PER_INCH = 72; const std::string EMPTY_STRING(""); +float ConvertToEven( float value ) +{ + int intValue(static_cast( value )); + return static_cast(intValue % 2 == 0) ? intValue : (intValue + 1); +} + } // namespace namespace Dali @@ -58,6 +61,39 @@ namespace Toolkit namespace Text { +/** + * @brief Adds a new font description run for the selected text. + * + * The new font parameters are added after the call to this method. + * + * @param[in] eventData The event data pointer. + * @param[in] logicalModel The logical model where to add the new font description run. + */ +FontDescriptionRun& UpdateSelectionFontStyleRun( EventData* eventData, + LogicalModelPtr logicalModel ) +{ + const bool handlesCrossed = eventData->mLeftSelectionPosition > eventData->mRightSelectionPosition; + + // Get start and end position of selection + const CharacterIndex startOfSelectedText = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition; + const Length lengthOfSelectedText = ( handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition ) - startOfSelectedText; + + // Add the font run. + const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count(); + logicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); + + FontDescriptionRun& fontDescriptionRun = *( logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); + + fontDescriptionRun.characterRun.characterIndex = startOfSelectedText; + fontDescriptionRun.characterRun.numberOfCharacters = lengthOfSelectedText; + + // Recalculate the selection highlight as the metrics may have changed. + eventData->mUpdateLeftSelectionPosition = true; + eventData->mUpdateRightSelectionPosition = true; + + return fontDescriptionRun; +} + ControllerPtr Controller::New( ControlInterface& controlInterface ) { return ControllerPtr( new Controller( controlInterface ) ); @@ -65,75 +101,131 @@ ControllerPtr Controller::New( ControlInterface& controlInterface ) void Controller::EnableTextInput( DecoratorPtr decorator ) { - if( !mImpl->mEventData ) + if( NULL == mImpl->mEventData ) { mImpl->mEventData = new EventData( decorator ); } } +void Controller::SetMarkupProcessorEnabled( bool enable ) +{ + mImpl->mMarkupProcessorEnabled = enable; +} + +bool Controller::IsMarkupProcessorEnabled() const +{ + return mImpl->mMarkupProcessorEnabled; +} + void Controller::SetText( const std::string& text ) { - // Cancel previously queued inserts etc. - mImpl->mModifyEvents.clear(); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" ); + + // Reset keyboard as text changed + mImpl->ResetImfManager(); - // Remove the previously set text + // Remove the previously set text and style. ResetText(); - if( ! text.empty() ) + // Remove the style. + ClearStyleData(); + + CharacterIndex lastCursorIndex = 0u; + + if( NULL != mImpl->mEventData ) + { + // If popup shown then hide it by switching to Editing state + if( ( EventData::SELECTING == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ) + { + mImpl->ChangeState( EventData::EDITING ); + } + } + + if( !text.empty() ) { + MarkupProcessData markupProcessData( mImpl->mLogicalModel->mColorRuns, + mImpl->mLogicalModel->mFontDescriptionRuns ); + + Length textSize = 0u; + const uint8_t* utf8 = NULL; + if( mImpl->mMarkupProcessorEnabled ) + { + ProcessMarkupString( text, markupProcessData ); + textSize = markupProcessData.markupProcessedText.size(); + + // This is a bit horrible but std::string returns a (signed) char* + utf8 = reinterpret_cast( markupProcessData.markupProcessedText.c_str() ); + } + else + { + textSize = text.size(); + + // This is a bit horrible but std::string returns a (signed) char* + utf8 = reinterpret_cast( text.c_str() ); + } + // Convert text into UTF-32 Vector& utf32Characters = mImpl->mLogicalModel->mText; - utf32Characters.Resize( text.size() ); - - // This is a bit horrible but std::string returns a (signed) char* - const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + utf32Characters.Resize( textSize ); // Transform a text array encoded in utf8 into an array encoded in utf32. // It returns the actual number of characters. - Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); + Length characterCount = Utf8ToUtf32( utf8, textSize, utf32Characters.Begin() ); utf32Characters.Resize( characterCount ); - DALI_ASSERT_DEBUG( text.size() >= characterCount && "Invalid UTF32 conversion length" ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, text.size(), mImpl->mLogicalModel->mText.Count() ); + 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() ); - // Reset the cursor position - if( mImpl->mEventData ) - { - mImpl->mEventData->mPrimaryCursorPosition = characterCount; - } + // To reset the cursor position + lastCursorIndex = characterCount; // Update the rest of the model during size negotiation mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); + + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model + mImpl->mOperationsPending = ALL_OPERATIONS; } else { ShowPlaceholderText(); } - if( mImpl->mEventData ) + // Resets the cursor position. + ResetCursorPosition( lastCursorIndex ); + + // Scrolls the text to make the cursor visible. + ResetScrollPosition(); + + mImpl->RequestRelayout(); + + if( NULL != mImpl->mEventData ) { // Cancel previously queued events mImpl->mEventData->mEventQueue.clear(); } - // Reset keyboard as text changed - mImpl->PreEditReset(); + // Notify IMF as text changed + NotifyImfManager(); + + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); } void Controller::GetText( std::string& text ) const { - if( ! mImpl->IsShowingPlaceholderText() ) + if( !mImpl->IsShowingPlaceholderText() ) { Vector& utf32Characters = mImpl->mLogicalModel->mText; if( 0u != utf32Characters.Count() ) { - uint32_t numberOfBytes = GetNumberOfUtf8Bytes( &utf32Characters[0], utf32Characters.Count() ); - - text.resize( numberOfBytes ); - - // This is a bit horrible but std::string returns a (signed) char* - Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), reinterpret_cast(&text[0]) ); + Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), text ); } } else @@ -144,7 +236,7 @@ void Controller::GetText( std::string& text ) const unsigned int Controller::GetLogicalCursorPosition() const { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { return mImpl->mEventData->mPrimaryCursorPosition; } @@ -154,7 +246,7 @@ unsigned int Controller::GetLogicalCursorPosition() const void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text ) { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { if( PLACEHOLDER_TYPE_INACTIVE == type ) { @@ -165,13 +257,18 @@ void Controller::SetPlaceholderText( PlaceholderType type, const std::string& te mImpl->mEventData->mPlaceholderTextActive = text; } - ShowPlaceholderText(); + // Update placeholder if there is no text + if( mImpl->IsShowingPlaceholderText() || + ( 0u == mImpl->mLogicalModel->mText.Count() ) ) + { + ShowPlaceholderText(); + } } } void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { if( PLACEHOLDER_TYPE_INACTIVE == type ) { @@ -184,12 +281,9 @@ void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) c } } -void Controller::SetMaximumNumberOfCharacters( int maxCharacters ) +void Controller::SetMaximumNumberOfCharacters( Length maxCharacters ) { - if ( maxCharacters >= 0 ) - { - mImpl->mMaximumNumberOfCharacters = maxCharacters; - } + mImpl->mMaximumNumberOfCharacters = maxCharacters; } int Controller::GetMaximumNumberOfCharacters() @@ -199,12 +293,14 @@ int Controller::GetMaximumNumberOfCharacters() void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } - mImpl->mFontDefaults->mDefaultFontFamily = defaultFontFamily; + mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily; + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str()); + mImpl->mFontDefaults->familyDefined = true; // Clear the font-specific data ClearFontData(); @@ -217,22 +313,43 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) const std::string& Controller::GetDefaultFontFamily() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) + { + return mImpl->mFontDefaults->mFontDescription.family; + } + + return EMPTY_STRING; +} + +void Controller::SetDefaultFontStyle( const std::string& style ) +{ + if( NULL == mImpl->mFontDefaults ) + { + mImpl->mFontDefaults = new FontDefaults(); + } + + mImpl->mFontDefaults->mFontStyle = style; +} + +const std::string& Controller::GetDefaultFontStyle() const +{ + if( NULL != mImpl->mFontDefaults ) { - return mImpl->mFontDefaults->mDefaultFontFamily; + return mImpl->mFontDefaults->mFontStyle; } return EMPTY_STRING; } -void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) +void Controller::SetDefaultFontWeight( FontWeight weight ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } - mImpl->mFontDefaults->mDefaultFontStyle = defaultFontStyle; + mImpl->mFontDefaults->mFontDescription.weight = weight; + mImpl->mFontDefaults->weightDefined = true; // Clear the font-specific data ClearFontData(); @@ -243,24 +360,92 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) mImpl->RequestRelayout(); } -const std::string& Controller::GetDefaultFontStyle() const +FontWeight Controller::GetDefaultFontWeight() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { - return mImpl->mFontDefaults->mDefaultFontStyle; + return mImpl->mFontDefaults->mFontDescription.weight; } - return EMPTY_STRING; + return TextAbstraction::FontWeight::NORMAL; +} + +void Controller::SetDefaultFontWidth( FontWidth width ) +{ + if( NULL == mImpl->mFontDefaults ) + { + mImpl->mFontDefaults = new FontDefaults(); + } + + mImpl->mFontDefaults->mFontDescription.width = width; + mImpl->mFontDefaults->widthDefined = true; + + // Clear the font-specific data + ClearFontData(); + + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + + mImpl->RequestRelayout(); +} + +FontWidth Controller::GetDefaultFontWidth() const +{ + if( NULL != mImpl->mFontDefaults ) + { + return mImpl->mFontDefaults->mFontDescription.width; + } + + return TextAbstraction::FontWidth::NORMAL; +} + +void Controller::SetDefaultFontSlant( FontSlant slant ) +{ + if( NULL == mImpl->mFontDefaults ) + { + mImpl->mFontDefaults = new FontDefaults(); + } + + mImpl->mFontDefaults->mFontDescription.slant = slant; + mImpl->mFontDefaults->slantDefined = true; + + // Clear the font-specific data + ClearFontData(); + + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + + mImpl->RequestRelayout(); +} + +FontSlant Controller::GetDefaultFontSlant() const +{ + if( NULL != mImpl->mFontDefaults ) + { + return mImpl->mFontDefaults->mFontDescription.slant; + } + + return TextAbstraction::FontSlant::NORMAL; } void Controller::SetDefaultPointSize( float pointSize ) { - if( !mImpl->mFontDefaults ) + if( NULL == mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultPointSize = pointSize; + mImpl->mFontDefaults->sizeDefined = true; + + unsigned int horizontalDpi( 0u ); + unsigned int verticalDpi( 0u ); + mImpl->mFontClient.GetDpi( horizontalDpi, verticalDpi ); + + // Adjust the metrics if the fixed-size font should be down-scaled + int maxEmojiSize( pointSize/POINTS_PER_INCH * verticalDpi ); + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultPointSize %p setting MaxEmojiSize %d\n", this, maxEmojiSize ); + mImpl->mMetrics->SetMaxEmojiSize( maxEmojiSize ); // Clear the font-specific data ClearFontData(); @@ -273,7 +458,7 @@ void Controller::SetDefaultPointSize( float pointSize ) float Controller::GetDefaultPointSize() const { - if( mImpl->mFontDefaults ) + if( NULL != mImpl->mFontDefaults ) { return mImpl->mFontDefaults->mDefaultPointSize; } @@ -281,13 +466,31 @@ float Controller::GetDefaultPointSize() const return 0.0f; } +void Controller::UpdateAfterFontChange( std::string& newDefaultFont ) +{ + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange"); + + 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() ); + ClearFontData(); + mImpl->mFontDefaults->mFontDescription.family = newDefaultFont; + mImpl->UpdateModel( ALL_OPERATIONS ); + mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); + mImpl->mRecalculateNaturalSize = true; + mImpl->RequestRelayout(); + } +} + void Controller::SetTextColor( const Vector4& textColor ) { mImpl->mTextColor = textColor; - if( ! mImpl->IsShowingPlaceholderText() ) + if( !mImpl->IsShowingPlaceholderText() ) { mImpl->mVisualModel->SetTextColor( textColor ); + + mImpl->RequestRelayout(); } } @@ -298,12 +501,17 @@ const Vector4& Controller::GetTextColor() const bool Controller::RemoveText( int cursorOffset, int numberOfChars ) { - bool removed( false ); + 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 numberOfChars %d\n", this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfChars ); - if( ! mImpl->IsShowingPlaceholderText() ) + if( !mImpl->IsShowingPlaceholderText() ) { // Delete at current cursor position Vector& currentText = mImpl->mLogicalModel->mText; @@ -317,14 +525,25 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars ) cursorIndex = oldCursorIndex + cursorOffset; } - if( (cursorIndex + numberOfChars) > currentText.Count() ) + if( ( cursorIndex + numberOfChars ) > currentText.Count() ) { numberOfChars = currentText.Count() - cursorIndex; } - if( cursorIndex >= 0 && - (cursorIndex + numberOfChars) <= currentText.Count() ) + if( ( cursorIndex + numberOfChars ) <= currentText.Count() ) { + // Update the input style and remove the text's style before removing the text. + + // Set first the default input style. + mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle ); + + // Update the input style. + mImpl->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle ); + + // Remove the text's style before removing the text. + mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfChars ); + + // Remove the characters. Vector::Iterator first = currentText.Begin() + cursorIndex; Vector::Iterator last = first + numberOfChars; @@ -343,7 +562,7 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars ) void Controller::SetPlaceholderTextColor( const Vector4& textColor ) { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { mImpl->mEventData->mPlaceholderTextColor = textColor; } @@ -351,12 +570,13 @@ void Controller::SetPlaceholderTextColor( const Vector4& textColor ) if( mImpl->IsShowingPlaceholderText() ) { mImpl->mVisualModel->SetTextColor( textColor ); + mImpl->RequestRelayout(); } } const Vector4& Controller::GetPlaceholderTextColor() const { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { return mImpl->mEventData->mPlaceholderTextColor; } @@ -367,6 +587,8 @@ const Vector4& Controller::GetPlaceholderTextColor() const void Controller::SetShadowOffset( const Vector2& shadowOffset ) { mImpl->mVisualModel->SetShadowOffset( shadowOffset ); + + mImpl->RequestRelayout(); } const Vector2& Controller::GetShadowOffset() const @@ -377,6 +599,8 @@ const Vector2& Controller::GetShadowOffset() const void Controller::SetShadowColor( const Vector4& shadowColor ) { mImpl->mVisualModel->SetShadowColor( shadowColor ); + + mImpl->RequestRelayout(); } const Vector4& Controller::GetShadowColor() const @@ -387,6 +611,8 @@ const Vector4& Controller::GetShadowColor() const void Controller::SetUnderlineColor( const Vector4& color ) { mImpl->mVisualModel->SetUnderlineColor( color ); + + mImpl->RequestRelayout(); } const Vector4& Controller::GetUnderlineColor() const @@ -397,6 +623,8 @@ const Vector4& Controller::GetUnderlineColor() const void Controller::SetUnderlineEnabled( bool enabled ) { mImpl->mVisualModel->SetUnderlineEnabled( enabled ); + + mImpl->RequestRelayout(); } bool Controller::IsUnderlineEnabled() const @@ -407,6 +635,8 @@ bool Controller::IsUnderlineEnabled() const void Controller::SetUnderlineHeight( float height ) { mImpl->mVisualModel->SetUnderlineHeight( height ); + + mImpl->RequestRelayout(); } float Controller::GetUnderlineHeight() const @@ -414,105 +644,370 @@ float Controller::GetUnderlineHeight() const return mImpl->mVisualModel->GetUnderlineHeight(); } -void Controller::SetEnableCursorBlink( bool enable ) +void Controller::SetInputColor( const Vector4& color ) { - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" ); - - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { - mImpl->mEventData->mCursorBlinkEnabled = enable; + mImpl->mEventData->mInputStyle.textColor = color; - if( !enable && - mImpl->mEventData->mDecorator ) + if( EventData::SELECTING == mImpl->mEventData->mState ) { - mImpl->mEventData->mDecorator->StopCursorBlink(); + const bool handlesCrossed = mImpl->mEventData->mLeftSelectionPosition > mImpl->mEventData->mRightSelectionPosition; + + // Get start and end position of selection + const CharacterIndex startOfSelectedText = handlesCrossed ? mImpl->mEventData->mRightSelectionPosition : mImpl->mEventData->mLeftSelectionPosition; + 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 ); + + ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); + colorRun.color = color; + colorRun.characterRun.characterIndex = startOfSelectedText; + colorRun.characterRun.numberOfCharacters = lengthOfSelectedText; + + // Request to relayout. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | COLOR ); + mImpl->RequestRelayout(); } } } -bool Controller::GetEnableCursorBlink() const +const Vector4& Controller::GetInputColor() const { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { - return mImpl->mEventData->mCursorBlinkEnabled; + return mImpl->mEventData->mInputStyle.textColor; } - return false; + // Return the default text's color if there is no EventData. + return mImpl->mTextColor; + } -const Vector2& Controller::GetScrollPosition() const +void Controller::SetInputFontFamily( const std::string& fontFamily ) { - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { - return mImpl->mEventData->mScrollPosition; + mImpl->mEventData->mInputStyle.familyName = fontFamily; + mImpl->mEventData->mInputStyle.familyDefined = true; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel ); + + fontDescriptionRun.familyLength = fontFamily.size(); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyDefined = true; + + // The memory allocated for the font family name is freed when the font description is removed from the logical model. + + // Request to relayout. + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + mImpl->RequestRelayout(); + + // As the font changes, recalculate the handle positions is needed. + mImpl->mEventData->mUpdateLeftSelectionPosition = true; + mImpl->mEventData->mUpdateRightSelectionPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +const std::string& Controller::GetInputFontFamily() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.familyName; } - return Vector2::ZERO; + // Return the default font's family if there is no EventData. + return GetDefaultFontFamily(); } -const Vector2& Controller::GetAlignmentOffset() const +void Controller::SetInputFontStyle( const std::string& fontStyle ) { - return mImpl->mAlignmentOffset; + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.fontStyle = fontStyle; + } } -Vector3 Controller::GetNaturalSize() +const std::string& Controller::GetInputFontStyle() const { - Vector3 naturalSize; + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.fontStyle; + } - // Make sure the model is up-to-date before layouting - ProcessModifyEvents(); + // Return the default font's style if there is no EventData. + return GetDefaultFontStyle(); +} - if( mImpl->mRecalculateNaturalSize ) +void Controller::SetInputFontWeight( FontWeight weight ) +{ + if( NULL != mImpl->mEventData ) { - // Operations that can be done only once until the text changes. - const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | - GET_SCRIPTS | - VALIDATE_FONTS | - GET_LINE_BREAKS | - GET_WORD_BREAKS | - BIDI_INFO | - SHAPE_TEXT | - GET_GLYPH_METRICS ); - // Make sure the model is up-to-date before layouting - mImpl->UpdateModel( onlyOnceOperations ); + mImpl->mEventData->mInputStyle.weight = weight; + mImpl->mEventData->mInputStyle.weightDefined = true; - // Operations that need to be done if the size changes. - const OperationsMask sizeOperations = static_cast( LAYOUT | - ALIGN | - REORDER ); + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel ); - DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), - static_cast( onlyOnceOperations | - sizeOperations ), - naturalSize.GetVectorXY() ); + fontDescriptionRun.weight = weight; + fontDescriptionRun.weightDefined = true; - // Do not do again the only once operations. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); + // Request to relayout. + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + mImpl->RequestRelayout(); - // Do the size related operations again. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + // As the font might change, recalculate the handle positions is needed. + mImpl->mEventData->mUpdateLeftSelectionPosition = true; + mImpl->mEventData->mUpdateRightSelectionPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} - // Stores the natural size to avoid recalculate it again - // unless the text/style changes. - mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() ); +FontWeight Controller::GetInputFontWeight() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.weight; + } - mImpl->mRecalculateNaturalSize = false; + return GetDefaultFontWeight(); +} + +void Controller::SetInputFontWidth( FontWidth width ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.width = width; + mImpl->mEventData->mInputStyle.widthDefined = true; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel ); + + fontDescriptionRun.width = width; + fontDescriptionRun.widthDefined = true; + + // Request to relayout. + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + mImpl->RequestRelayout(); + + // As the font might change, recalculate the handle positions is needed. + mImpl->mEventData->mUpdateLeftSelectionPosition = true; + mImpl->mEventData->mUpdateRightSelectionPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } } - else +} + +FontWidth Controller::GetInputFontWidth() const +{ + if( NULL != mImpl->mEventData ) { - naturalSize = mImpl->mVisualModel->GetNaturalSize(); + return mImpl->mEventData->mInputStyle.width; } - return naturalSize; + return GetDefaultFontWidth(); } -float Controller::GetHeightForWidth( float width ) +void Controller::SetInputFontSlant( FontSlant slant ) { - // Make sure the model is up-to-date before layouting - ProcessModifyEvents(); + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.slant = slant; + mImpl->mEventData->mInputStyle.slantDefined = true; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel ); + + fontDescriptionRun.slant = slant; + fontDescriptionRun.slantDefined = true; + + // Request to relayout. + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + mImpl->RequestRelayout(); + + // As the font might change, recalculate the handle positions is needed. + mImpl->mEventData->mUpdateLeftSelectionPosition = true; + mImpl->mEventData->mUpdateRightSelectionPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +FontSlant Controller::GetInputFontSlant() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.slant; + } + + return GetDefaultFontSlant(); +} + +void Controller::SetInputFontPointSize( float size ) +{ + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mInputStyle.size = size; + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mLogicalModel ); + + fontDescriptionRun.size = static_cast( size * 64.f ); + fontDescriptionRun.sizeDefined = true; + + // Request to relayout. + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + mImpl->RequestRelayout(); + + // As the font might change, recalculate the handle positions is needed. + mImpl->mEventData->mUpdateLeftSelectionPosition = true; + mImpl->mEventData->mUpdateRightSelectionPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } + } +} + +float Controller::GetInputFontPointSize() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mInputStyle.size; + } + + // Return the default font's point size if there is no EventData. + return GetDefaultPointSize(); +} + +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; +} + +const Vector2& Controller::GetScrollPosition() const +{ + if( NULL != mImpl->mEventData ) + { + return mImpl->mEventData->mScrollPosition; + } + + return Vector2::ZERO; +} + +const Vector2& Controller::GetAlignmentOffset() const +{ + return mImpl->mAlignmentOffset; +} + +Vector3 Controller::GetNaturalSize() +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n" ); + Vector3 naturalSize; + + // Make sure the model is up-to-date before layouting + ProcessModifyEvents(); + + if( mImpl->mRecalculateNaturalSize ) + { + // Operations that can be done only once until the text changes. + const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | + GET_SCRIPTS | + VALIDATE_FONTS | + GET_LINE_BREAKS | + GET_WORD_BREAKS | + BIDI_INFO | + SHAPE_TEXT | + GET_GLYPH_METRICS ); + // Make sure the model is up-to-date before layouting + mImpl->UpdateModel( onlyOnceOperations ); + + // Operations that need to be done if the size changes. + const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | + REORDER ); + + DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), + static_cast( onlyOnceOperations | + sizeOperations ), + naturalSize.GetVectorXY() ); + + // Do not do again the only once operations. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); + + // Do the size related operations again. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + + // Stores the natural size to avoid recalculate it again + // unless the text/style changes. + mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() ); + + mImpl->mRecalculateNaturalSize = false; + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); + } + else + { + naturalSize = mImpl->mVisualModel->GetNaturalSize(); + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); + } + + naturalSize.x = ConvertToEven( naturalSize.x ); + naturalSize.y = ConvertToEven( naturalSize.y ); + + return naturalSize; +} + +float Controller::GetHeightForWidth( float width ) +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", this, width ); + // Make sure the model is up-to-date before layouting + ProcessModifyEvents(); Size layoutSize; - if( width != mImpl->mControlSize.width ) + if( fabsf( width - mImpl->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 | @@ -541,10 +1036,12 @@ float Controller::GetHeightForWidth( float width ) // Do the size related operations again. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height ); } else { - layoutSize = mImpl->mVisualModel->GetActualSize(); + layoutSize = mImpl->mVisualModel->GetLayoutSize(); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height ); } return layoutSize.height; @@ -552,78 +1049,125 @@ float Controller::GetHeightForWidth( float width ) bool Controller::Relayout( const Size& size ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::Relayout %p --> size %f,%f\n", this, size.width, size.height ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f\n", this, size.width, size.height ); if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { bool glyphsRemoved( false ); - if( 0u != mImpl->mVisualModel->GetNumberOfGlyphPositions() ) + if( 0u != mImpl->mVisualModel->mGlyphPositions.Count() ) { - mImpl->mVisualModel->SetGlyphPositions( NULL, 0u ); + mImpl->mVisualModel->mGlyphPositions.Clear(); glyphsRemoved = true; } // Not worth to relayout if width or height is equal to zero. - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::Relayout <-- (skipped)\n" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n" ); return glyphsRemoved; } - if( size != mImpl->mControlSize ) + // Whether a new size has been set. + const bool newSize = ( size != mImpl->mVisualModel->mControlSize ); + + if( newSize ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mControlSize.width, mImpl->mControlSize.height ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mVisualModel->mControlSize.width, mImpl->mVisualModel->mControlSize.height ); - // Operations that need to be done if the size changes. + // Layout operations that need to be done if the size changes. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT | ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); - mImpl->mControlSize = size; + mImpl->mVisualModel->mControlSize = size; } - // Make sure the model is up-to-date before layouting + // Whether there are modify events. + const bool isModifyEventsEmpty = 0u == mImpl->mModifyEvents.Count(); + + // Make sure the model is up-to-date before layouting. ProcessModifyEvents(); mImpl->UpdateModel( mImpl->mOperationsPending ); + // Style operations that need to be done if the text is modified. + if( !isModifyEventsEmpty ) + { + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + COLOR ); + } + + // Apply the style runs if text is modified. + bool updated = mImpl->UpdateModelStyle( mImpl->mOperationsPending ); + + // Layout the text. Size layoutSize; - bool updated = DoRelayout( mImpl->mControlSize, - mImpl->mOperationsPending, - layoutSize ); + updated = DoRelayout( mImpl->mVisualModel->mControlSize, + mImpl->mOperationsPending, + layoutSize ) || updated; // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; + // Whether the text control is editable + const bool isEditable = NULL != mImpl->mEventData; + + // Keep the current offset and alignment as it will be used to update the decorator's positions (if the size changes). + Vector2 offset; + if( newSize && isEditable ) + { + offset = mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition; + } + // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated. CalculateTextAlignment( size ); - if( mImpl->mEventData ) + if( isEditable ) { + if( newSize ) + { + // If there is a new size, the scroll position needs to be clamped. + mImpl->ClampHorizontalScroll( layoutSize ); + + // Update the decorator's positions is needed if there is a new size. + mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition - offset ); + } + // Move the cursor, grab handle etc. updated = mImpl->ProcessInputEvents() || updated; } - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::Relayout <--\n" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout\n" ); return updated; } void Controller::ProcessModifyEvents() { - std::vector& events = mImpl->mModifyEvents; + Vector& events = mImpl->mModifyEvents; + + if( 0u == events.Count() ) + { + // Nothing to do. + return; + } - for( unsigned int i=0; i::ConstIterator it = events.Begin(), + endIt = events.End(); + it != endIt; + ++it ) { - if( ModifyEvent::TEXT_REPLACED == events[0].type ) + 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( 0 == i && "Unexpected TEXT_REPLACED event" ); + DALI_ASSERT_DEBUG( it == events.Begin() && "Unexpected TEXT_REPLACED event" ); TextReplacedEvent(); } - else if( ModifyEvent::TEXT_INSERTED == events[0].type ) + else if( ModifyEvent::TEXT_INSERTED == event.type ) { TextInsertedEvent(); } - else if( ModifyEvent::TEXT_DELETED == events[0].type ) + else if( ModifyEvent::TEXT_DELETED == event.type ) { // Placeholder-text cannot be deleted if( !mImpl->IsShowingPlaceholderText() ) @@ -633,8 +1177,14 @@ void Controller::ProcessModifyEvents() } } + if( NULL != mImpl->mEventData ) + { + // When the text is being modified, delay cursor blinking + mImpl->mEventData->mDecorator->DelayCursorBlink(); + } + // Discard temporary text - events.clear(); + events.Clear(); } void Controller::ResetText() @@ -643,12 +1193,6 @@ void Controller::ResetText() mImpl->mLogicalModel->mText.Clear(); ClearModelData(); - // Reset the cursor position - if( mImpl->mEventData ) - { - mImpl->mEventData->mPrimaryCursorPosition = 0; - } - // We have cleared everything including the placeholder-text mImpl->PlaceholderCleared(); @@ -659,6 +1203,31 @@ void Controller::ResetText() mImpl->mOperationsPending = ALL_OPERATIONS; } +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->mEventData->mScrollPosition = Vector2::ZERO; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } +} + void Controller::TextReplacedEvent() { // Reset buffers. @@ -680,6 +1249,11 @@ void Controller::TextInsertedEvent() { DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" ); + if( NULL == mImpl->mEventData ) + { + return; + } + // TODO - Optimize this ClearModelData(); @@ -695,14 +1269,22 @@ void Controller::TextInsertedEvent() REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; + if( EventData::IsEditingState( mImpl->mEventData->mState ) ) + { + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } } void Controller::TextDeletedEvent() { DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" ); + if( NULL == mImpl->mEventData ) + { + return; + } + // TODO - Optimize this ClearModelData(); @@ -719,13 +1301,17 @@ void Controller::TextDeletedEvent() // Queue a cursor reposition event; this must wait until after DoRelayout() mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; + if( 0u != mImpl->mLogicalModel->mText.Count() ) + { + mImpl->mEventData->mScrollAfterDelete = true; + } } 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 ); // Calculate the operations to be done. @@ -737,31 +1323,42 @@ bool Controller::DoRelayout( const Size& size, // after the first time the text has been laid out. // Fill the vectors again. - Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs(); + const Length numberOfGlyphs = mImpl->mVisualModel->mGlyphs.Count(); if( 0u == numberOfGlyphs ) { + if( UPDATE_ACTUAL_SIZE & operations ) + { + mImpl->mVisualModel->SetLayoutSize( Size::ZERO ); + } + // 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; } - Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; - Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; - Vector& characterDirection = mImpl->mLogicalModel->mCharacterDirections; - Vector& glyphs = mImpl->mVisualModel->mGlyphs; - Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; - Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; + 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(); + const Vector& charactersToGlyph = mImpl->mVisualModel->mCharactersToGlyph; + const Vector& glyphsPerCharacter = mImpl->mVisualModel->mGlyphsPerCharacter; // Set the layout parameters. LayoutParameters layoutParameters( size, - mImpl->mLogicalModel->mText.Begin(), + textBuffer, lineBreakInfo.Begin(), wordBreakInfo.Begin(), ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, - numberOfGlyphs, glyphs.Begin(), glyphsToCharactersMap.Begin(), - charactersPerGlyph.Begin() ); + charactersPerGlyph.Begin(), + charactersToGlyph.Begin(), + glyphsPerCharacter.Begin(), + numberOfGlyphs ); // The laid-out lines. // It's not possible to know in how many lines the text is going to be laid-out, @@ -779,6 +1376,13 @@ bool Controller::DoRelayout( const Size& size, Vector& glyphPositions = mImpl->mVisualModel->mGlyphPositions; glyphPositions.Resize( numberOfGlyphs ); + // Whether the last character is a new paragraph character. + layoutParameters.isLastNewParagraph = TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mLogicalModel->mText.Count() - 1u ) ) ); + + // The initial glyph and the number of glyphs to layout. + layoutParameters.startGlyphIndex = 0u; + layoutParameters.numberOfGlyphs = numberOfGlyphs; + // Update the visual model. viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, glyphPositions, @@ -791,181 +1395,292 @@ bool Controller::DoRelayout( const Size& size, if( REORDER & operations ) { Vector& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo; + Vector& bidirectionalLineInfo = mImpl->mLogicalModel->mBidirectionalLineInfo; // Check first if there are paragraphs with bidirectional info. if( 0u != bidirectionalInfo.Count() ) { // Get the lines - const Length numberOfLines = mImpl->mVisualModel->GetNumberOfLines(); + const Length numberOfLines = mImpl->mVisualModel->mLines.Count(); + const CharacterIndex startIndex = 0u; + const Length requestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); // Reorder the lines. - Vector lineBidirectionalInfoRuns; - lineBidirectionalInfoRuns.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters. + bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters. ReorderLines( bidirectionalInfo, + startIndex, + requestedNumberOfCharacters, lines, - lineBidirectionalInfoRuns ); - - // Set the bidirectional info into the model. - const Length numberOfBidirectionalInfoRuns = lineBidirectionalInfoRuns.Count(); - mImpl->mLogicalModel->SetVisualToLogicalMap( lineBidirectionalInfoRuns.Begin(), - numberOfBidirectionalInfoRuns ); + bidirectionalLineInfo ); // Set the bidirectional info per line into the layout parameters. - layoutParameters.lineBidirectionalInfoRunsBuffer = lineBidirectionalInfoRuns.Begin(); - layoutParameters.numberOfBidirectionalInfoRuns = numberOfBidirectionalInfoRuns; + layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin(); + layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count(); - // Get the character to glyph conversion table and set into the layout. - layoutParameters.charactersToGlyphsBuffer = mImpl->mVisualModel->mCharactersToGlyph.Begin(); - - // Get the glyphs per character table and set into the layout. - layoutParameters.glyphsPerCharacterBuffer = mImpl->mVisualModel->mGlyphsPerCharacter.Begin(); + // Set the bidirectional info into the model. + mImpl->mLogicalModel->SetVisualToLogicalMap( layoutParameters.lineBidirectionalInfoRunsBuffer, + layoutParameters.numberOfBidirectionalInfoRuns, + startIndex, + requestedNumberOfCharacters ); // Re-layout the text. Reorder those lines with right to left characters. mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters, + startIndex, + requestedNumberOfCharacters, glyphPositions ); // Free the allocated memory used to store the conversion table in the bidirectional line info run. - for( Vector::Iterator it = lineBidirectionalInfoRuns.Begin(), - endIt = lineBidirectionalInfoRuns.End(); + for( Vector::Iterator it = bidirectionalLineInfo.Begin(), + endIt = bidirectionalLineInfo.End(); it != endIt; ++it ) { BidirectionalLineInfoRun& bidiLineInfo = *it; free( bidiLineInfo.visualToLogicalMap ); + bidiLineInfo.visualToLogicalMap = NULL; } + + bidirectionalLineInfo.Clear(); } } // REORDER - if( ALIGN & operations ) - { - mImpl->mLayoutEngine.Align( layoutParameters, - layoutSize, - lines, - glyphPositions ); - } - // Sets the actual size. if( UPDATE_ACTUAL_SIZE & operations ) { - mImpl->mVisualModel->SetActualSize( layoutSize ); + mImpl->mVisualModel->SetLayoutSize( layoutSize ); } } // view updated } else { - layoutSize = mImpl->mVisualModel->GetActualSize(); + layoutSize = mImpl->mVisualModel->GetLayoutSize(); + } + + if( ALIGN & operations ) + { + // The laid-out lines. + Vector& lines = mImpl->mVisualModel->mLines; + + const CharacterIndex startIndex = 0u; + const Length requestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); + + mImpl->mLayoutEngine.Align( size, + startIndex, + requestedNumberOfCharacters, + lines ); + + viewUpdated = true; } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); return viewUpdated; } -void Controller::CalculateTextAlignment( const Size& size ) +void Controller::SetMultiLineEnabled( bool enable ) { - // Get the direction of the first character. - const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u ); + const LayoutEngine::Layout layout = enable ? LayoutEngine::MULTI_LINE_BOX : LayoutEngine::SINGLE_LINE_BOX; - const Size& actualSize = mImpl->mVisualModel->GetActualSize(); - - // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END; - LayoutEngine::HorizontalAlignment horizontalAlignment = mImpl->mLayoutEngine.GetHorizontalAlignment(); - if( firstParagraphDirection && - ( LayoutEngine::HORIZONTAL_ALIGN_CENTER != horizontalAlignment ) ) + if( layout != mImpl->mLayoutEngine.GetLayout() ) { - if( LayoutEngine::HORIZONTAL_ALIGN_BEGIN == horizontalAlignment ) - { - horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_END; - } - else - { - horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_BEGIN; - } - } + // Set the layout type. + mImpl->mLayoutEngine.SetLayout( layout ); - switch( horizontalAlignment ) - { - case LayoutEngine::HORIZONTAL_ALIGN_BEGIN: - { - mImpl->mAlignmentOffset.x = 0.f; - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_CENTER: - { - const int intOffset = static_cast( 0.5f * ( size.width - actualSize.width ) ); // try to avoid pixel alignment. - mImpl->mAlignmentOffset.x = static_cast( intOffset ); - break; - } - case LayoutEngine::HORIZONTAL_ALIGN_END: - { - mImpl->mAlignmentOffset.x = size.width - actualSize.width; - break; - } - } + // Set the flags to redo the layout operations + const OperationsMask layoutOperations = static_cast( LAYOUT | + UPDATE_ACTUAL_SIZE | + ALIGN | + REORDER ); - const LayoutEngine::VerticalAlignment verticalAlignment = mImpl->mLayoutEngine.GetVerticalAlignment(); - switch( verticalAlignment ) - { - case LayoutEngine::VERTICAL_ALIGN_TOP: - { - mImpl->mAlignmentOffset.y = 0.f; - break; - } - case LayoutEngine::VERTICAL_ALIGN_CENTER: - { - const int intOffset = static_cast( 0.5f * ( size.height - actualSize.height ) ); // try to avoid pixel alignment. - mImpl->mAlignmentOffset.y = static_cast( intOffset ); - break; - } - case LayoutEngine::VERTICAL_ALIGN_BOTTOM: - { - mImpl->mAlignmentOffset.y = size.height - actualSize.height; - break; - } + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | layoutOperations ); + + mImpl->RequestRelayout(); } } -LayoutEngine& Controller::GetLayoutEngine() +bool Controller::IsMultiLineEnabled() const { - return mImpl->mLayoutEngine; + return LayoutEngine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout(); } -View& Controller::GetView() +void Controller::SetHorizontalAlignment( LayoutEngine::HorizontalAlignment alignment ) { - return mImpl->mView; + if( alignment != mImpl->mLayoutEngine.GetHorizontalAlignment() ) + { + // Set the alignment. + mImpl->mLayoutEngine.SetHorizontalAlignment( alignment ); + + // Set the flag to redo the alignment operation. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); + + mImpl->RequestRelayout(); + } } -void Controller::KeyboardFocusGainEvent() +LayoutEngine::HorizontalAlignment Controller::GetHorizontalAlignment() const { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); + return mImpl->mLayoutEngine.GetHorizontalAlignment(); +} - if( mImpl->mEventData ) +void Controller::SetVerticalAlignment( LayoutEngine::VerticalAlignment alignment ) +{ + if( alignment != mImpl->mLayoutEngine.GetVerticalAlignment() ) { - Event event( Event::KEYBOARD_FOCUS_GAIN_EVENT ); - mImpl->mEventData->mEventQueue.push_back( event ); + // Set the alignment. + mImpl->mLayoutEngine.SetVerticalAlignment( alignment ); + + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); mImpl->RequestRelayout(); } } -void Controller::KeyboardFocusLostEvent() +LayoutEngine::VerticalAlignment Controller::GetVerticalAlignment() const { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); + return mImpl->mLayoutEngine.GetVerticalAlignment(); +} + +void Controller::CalculateTextAlignment( const Size& controlSize ) +{ + Size layoutSize = mImpl->mVisualModel->GetLayoutSize(); - if( mImpl->mEventData ) + if( fabsf( layoutSize.height ) < Math::MACHINE_EPSILON_1000 ) { - Event event( Event::KEYBOARD_FOCUS_LOST_EVENT ); - mImpl->mEventData->mEventQueue.push_back( event ); + // Get the line height of the default font. + layoutSize.height = mImpl->GetDefaultFontLineHeight(); + } + + if( LayoutEngine::SINGLE_LINE_BOX == mImpl->mLayoutEngine.GetLayout() ) + { + // Get the direction of the first character. + const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u ); + + // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END; + LayoutEngine::HorizontalAlignment horizontalAlignment = mImpl->mLayoutEngine.GetHorizontalAlignment(); + if( firstParagraphDirection ) + { + switch( horizontalAlignment ) + { + case LayoutEngine::HORIZONTAL_ALIGN_BEGIN: + { + horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_END; + break; + } + case LayoutEngine::HORIZONTAL_ALIGN_CENTER: + { + // Nothing to do. + break; + } + case LayoutEngine::HORIZONTAL_ALIGN_END: + { + horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_BEGIN; + break; + } + } + } + + switch( horizontalAlignment ) + { + case LayoutEngine::HORIZONTAL_ALIGN_BEGIN: + { + mImpl->mAlignmentOffset.x = 0.f; + break; + } + case LayoutEngine::HORIZONTAL_ALIGN_CENTER: + { + mImpl->mAlignmentOffset.x = floorf( 0.5f * ( controlSize.width - layoutSize.width ) ); // try to avoid pixel alignment. + break; + } + case LayoutEngine::HORIZONTAL_ALIGN_END: + { + mImpl->mAlignmentOffset.x = controlSize.width - layoutSize.width; + break; + } + } + } + + const LayoutEngine::VerticalAlignment verticalAlignment = mImpl->mLayoutEngine.GetVerticalAlignment(); + switch( verticalAlignment ) + { + case LayoutEngine::VERTICAL_ALIGN_TOP: + { + mImpl->mAlignmentOffset.y = 0.f; + break; + } + case LayoutEngine::VERTICAL_ALIGN_CENTER: + { + mImpl->mAlignmentOffset.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment. + break; + } + case LayoutEngine::VERTICAL_ALIGN_BOTTOM: + { + mImpl->mAlignmentOffset.y = controlSize.height - layoutSize.height; + break; + } + } +} + +LayoutEngine& Controller::GetLayoutEngine() +{ + return mImpl->mLayoutEngine; +} + +View& Controller::GetView() +{ + return mImpl->mView; +} + +void Controller::KeyboardFocusGainEvent() +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); + + if( NULL != mImpl->mEventData ) + { + if( ( EventData::INACTIVE == mImpl->mEventData->mState ) || + ( EventData::INTERRUPTED == mImpl->mEventData->mState ) ) + { + mImpl->ChangeState( EventData::EDITING ); + mImpl->mEventData->mUpdateCursorPosition = true; //If editing started without tap event, cursor update must be triggered. + } + + if( mImpl->IsShowingPlaceholderText() ) + { + // Show alternative placeholder-text when editing + ShowPlaceholderText(); + } mImpl->RequestRelayout(); } } +void Controller::KeyboardFocusLostEvent() +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); + + if( NULL != mImpl->mEventData ) + { + if( EventData::INTERRUPTED != mImpl->mEventData->mState ) + { + mImpl->ChangeState( EventData::INACTIVE ); + + if( !mImpl->IsShowingRealText() ) + { + // Revert to regular placeholder-text when not editing + ShowPlaceholderText(); + } + } + } + mImpl->RequestRelayout(); +} + bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); - if( mImpl->mEventData && - keyEvent.state == KeyEvent::Down ) + bool textChanged( false ); + + if( ( NULL != mImpl->mEventData ) && + ( keyEvent.state == KeyEvent::Down ) ) { int keyCode = keyEvent.keyCode; const std::string& keyString = keyEvent.keyPressed; @@ -976,10 +1691,10 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) // 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 ) + 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 ) ) { Event event( Event::CURSOR_KEY_EVENT ); event.p1.mInt = keyCode; @@ -987,83 +1702,98 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) } else if( Dali::DALI_KEY_BACKSPACE == keyCode ) { - // Remove the character before the current cursor position - bool removed = RemoveText( -1, 1 ); + textChanged = BackspaceKeyEvent(); + } + else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) ) + { + 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 + } + else if( IsKey( keyEvent, Dali::DALI_KEY_MENU ) || + IsKey( keyEvent, Dali::DALI_KEY_HOME ) ) + { + 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 + } + 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. - if( removed ) - { - if( 0u == mImpl->mLogicalModel->mText.Count() ) - { - ShowPlaceholderText(); - } - else - { - mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); - } - } + // Do nothing. } else { + 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->ChangeState( EventData::EDITING ); // todo Confirm this is the best place to change the state of + if( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && + ( mImpl->mEventData->mState != EventData::INACTIVE ) ) + { + mImpl->ChangeState( EventData::EDITING ); + } mImpl->RequestRelayout(); } - return false; + if( textChanged ) + { + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); + } + + return true; } void Controller::InsertText( const std::string& text, Controller::InsertType type ) { - bool removedPreEdit( false ); + bool removedPrevious( false ); bool maxLengthReached( false ); DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" ) - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPreEditFlag %d cursor %d\n", - this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPrimaryCursorPosition ); - if( ! text.empty() ) + if( NULL == mImpl->mEventData ) { - if( mImpl->IsShowingPlaceholderText() ) - { - ResetText(); - } + return; } - if( mImpl->mEventData ) + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", + this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), + 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(); + + Vector utf32Characters; + Length characterCount( 0u ); + + // Remove the previous IMF pre-edit (predicitive text) + if( mImpl->mEventData->mPreEditFlag && + ( 0 != mImpl->mEventData->mPreEditLength ) ) { - if( COMMIT == type ) - { - mImpl->mEventData->mPreEditFlag = false; - } - else // PRE_EDIT - { - if( mImpl->mEventData->mPreEditFlag && - 0 != mImpl->mEventData->mPreEditLength ) - { - // Remove previous pre-edit text - mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; - removedPreEdit = RemoveText( -1, mImpl->mEventData->mPreEditLength ); - } - else - { - // Record the start of the pre-edit text - mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition; - mImpl->mEventData->mPreEditLength = text.size(); + CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); - } + removedPrevious = RemoveText( -static_cast(offset), mImpl->mEventData->mPreEditLength ); - mImpl->mEventData->mPreEditFlag = true; - } + mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; + mImpl->mEventData->mPreEditLength = 0; + } + else + { + // Remove the previous Selection + removedPrevious = RemoveSelectedText(); } - if( ! text.empty() ) + if( !text.empty() ) { // Convert text into UTF-32 - Vector utf32Characters; utf32Characters.Resize( text.size() ); // This is a bit horrible but std::string returns a (signed) char* @@ -1071,21 +1801,138 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // Transform a text array encoded in utf8 into an array encoded in utf32. // It returns the actual number of characters. - Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); + characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); utf32Characters.Resize( characterCount ); DALI_ASSERT_DEBUG( text.size() >= utf32Characters.Count() && "Invalid UTF32 conversion length" ); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "UTF8 size %d, UTF32 size %d\n", text.size(), utf32Characters.Count() ); + } + + if( 0u != utf32Characters.Count() ) // Check if Utf8ToUtf32 conversion succeeded + { + // The placeholder text is no longer needed + if( mImpl->IsShowingPlaceholderText() ) + { + ResetText(); + } + + mImpl->ChangeState( EventData::EDITING ); + + // Handle the IMF (predicitive text) state changes + if( COMMIT == type ) + { + // IMF manager is no longer handling key-events + mImpl->ClearPreEditFlag(); + } + else // PRE_EDIT + { + if( !mImpl->mEventData->mPreEditFlag ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" ); + + // Record the start of the pre-edit text + mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition; + } + + mImpl->mEventData->mPreEditLength = utf32Characters.Count(); + mImpl->mEventData->mPreEditFlag = true; + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); + } - const Length numberOfCharactersInModel = mImpl->mLogicalModel->GetNumberOfCharacters(); + const Length numberOfCharactersInModel = mImpl->mLogicalModel->mText.Count(); // Restrict new text to fit within Maximum characters setting - Length maxSizeOfNewText = std::min ( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); + Length maxSizeOfNewText = std::min( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); maxLengthReached = ( characterCount > maxSizeOfNewText ); - // Insert at current cursor position + // The cursor position. CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; + // Update the text's style. + + // Updates the text style runs by adding characters. + mImpl->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText ); + + // Get the character index from the cursor index. + const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u; + + // Retrieve the text's style for the given index. + InputStyle style; + mImpl->mLogicalModel->RetrieveStyle( styleIndex, style ); + + // Whether to add a new text color run. + const bool addColorRun = style.textColor != mImpl->mEventData->mInputStyle.textColor; + + // Whether to add a new font run. + const bool addFontNameRun = style.familyName != mImpl->mEventData->mInputStyle.familyName; + const bool addFontWeightRun = style.weight != mImpl->mEventData->mInputStyle.weight; + const bool addFontWidthRun = style.width != mImpl->mEventData->mInputStyle.width; + const bool addFontSlantRun = style.slant != mImpl->mEventData->mInputStyle.slant; + const bool addFontSizeRun = style.size != mImpl->mEventData->mInputStyle.size; + + // Add style runs. + if( addColorRun ) + { + const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mColorRuns.Count(); + mImpl->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); + + ColorRun& colorRun = *( mImpl->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); + colorRun.color = mImpl->mEventData->mInputStyle.textColor; + colorRun.characterRun.characterIndex = cursorIndex; + colorRun.characterRun.numberOfCharacters = maxSizeOfNewText; + } + + if( addFontNameRun || + addFontWeightRun || + addFontWidthRun || + addFontSlantRun || + addFontSizeRun ) + { + const VectorBase::SizeType numberOfRuns = mImpl->mLogicalModel->mFontDescriptionRuns.Count(); + mImpl->mLogicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); + + FontDescriptionRun& fontDescriptionRun = *( mImpl->mLogicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); + + if( addFontNameRun ) + { + fontDescriptionRun.familyLength = mImpl->mEventData->mInputStyle.familyName.size(); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy( fontDescriptionRun.familyName, mImpl->mEventData->mInputStyle.familyName.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyDefined = true; + + // The memory allocated for the font family name is freed when the font description is removed from the logical model. + } + + if( addFontWeightRun ) + { + fontDescriptionRun.weight = mImpl->mEventData->mInputStyle.weight; + fontDescriptionRun.weightDefined = true; + } + + if( addFontWidthRun ) + { + fontDescriptionRun.width = mImpl->mEventData->mInputStyle.width; + fontDescriptionRun.widthDefined = true; + } + + if( addFontSlantRun ) + { + fontDescriptionRun.slant = mImpl->mEventData->mInputStyle.slant; + fontDescriptionRun.slantDefined = true; + } + + if( addFontSizeRun ) + { + fontDescriptionRun.size = static_cast( mImpl->mEventData->mInputStyle.size * 64.f ); + fontDescriptionRun.sizeDefined = true; + } + + fontDescriptionRun.characterRun.characterIndex = cursorIndex; + fontDescriptionRun.characterRun.numberOfCharacters = maxSizeOfNewText; + } + + // Insert at current cursor position. Vector& modifyText = mImpl->mLogicalModel->mText; if( cursorIndex < numberOfCharactersInModel ) @@ -1102,7 +1949,16 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition ); } - if( removedPreEdit || !text.empty() ) + if( ( 0u == mImpl->mLogicalModel->mText.Count() ) && + mImpl->IsPlaceholderAvailable() ) + { + // Show place-holder if empty after removing the pre-edit text + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->ClearPreEditFlag(); + } + else if( removedPrevious || + ( 0 != utf32Characters.Count() ) ) { // Queue an inserted event mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED ); @@ -1112,36 +1968,116 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", mImpl->mLogicalModel->mText.Count() ); + mImpl->ResetImfManager(); + + // Do this last since it provides callbacks into application code mImpl->mControlInterface.MaxLengthReached(); + } +} + +bool Controller::RemoveSelectedText() +{ + bool textRemoved( false ); - mImpl->PreEditReset(); + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + std::string removedString; + mImpl->RetrieveSelection( removedString, true ); + + if( !removedString.empty() ) + { + textRemoved = true; + mImpl->ChangeState( EventData::EDITING ); + } } + + return textRemoved; } void Controller::TapEvent( unsigned int tapCount, float x, float y ) { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { - Event event( Event::TAP_EVENT ); - event.p1.mUint = tapCount; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); + DALI_LOG_INFO( gLogFilter, Debug::Concise, "TapEvent state:%d \n", mImpl->mEventData->mState ); - mImpl->RequestRelayout(); + if( 1u == tapCount ) + { + // This is to avoid unnecessary relayouts when tapping an empty text-field + bool relayoutNeeded( false ); + + if( ( EventData::EDITING_WITH_PASTE_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. + } + + 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 + { + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); + } + relayoutNeeded = true; + } + else + { + if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() ) + { + // Hide placeholder text + ResetText(); + } + + if( EventData::INACTIVE == mImpl->mEventData->mState ) + { + mImpl->ChangeState( EventData::EDITING ); + } + else if( !mImpl->IsClipboardEmpty() ) + { + mImpl->ChangeState( EventData::EDITING_WITH_POPUP ); + } + relayoutNeeded = true; + } + + // 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 ); + + mImpl->RequestRelayout(); + } + } + else if( 2u == tapCount ) + { + if( mImpl->mEventData->mSelectionEnabled && + mImpl->IsShowingRealText() ) + { + SelectEvent( x, y, false ); + } + } } // Reset keyboard as tap event has occurred. - mImpl->PreEditReset(); + mImpl->ResetImfManager(); } void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) + // Show cursor and grabhandle on first tap, this matches the behaviour of tapping when already editing { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) { Event event( Event::PAN_EVENT ); event.p1.mInt = state; @@ -1153,11 +2089,86 @@ void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) } } -void Controller::HandleEvent( HandleType handleType, HandleState state, float x, float y ) +void Controller::LongPressEvent( Gesture::State state, float x, float y ) +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" ); + + 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 ); + + Event event( Event::TAP_EVENT ); + event.p1.mUint = 1; + event.p2.mFloat = x; + event.p3.mFloat = y; + mImpl->mEventData->mEventQueue.push_back( event ); + + mImpl->RequestRelayout(); + } + else + { + // Reset the imf manger to commit the pre-edit before selecting the text. + mImpl->ResetImfManager(); + + SelectEvent( x, y, false ); + } + } + } +} + +void Controller::SelectEvent( float x, float y, bool selectAll ) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Controller::HandleEvent. Unexpected HandleEvent" ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" ); - if( mImpl->mEventData ) + if( NULL != mImpl->mEventData ) + { + mImpl->ChangeState( EventData::SELECTING ); + + 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->RequestRelayout(); + } +} + +void Controller::GetTargetSize( Vector2& targetSize ) +{ + targetSize = mImpl->mVisualModel->mControlSize; +} + +void Controller::AddDecoration( Actor& actor, bool needsClipping ) +{ + mImpl->mControlInterface.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 ) { switch( handleType ) { @@ -1191,6 +2202,12 @@ void Controller::HandleEvent( HandleType handleType, HandleState state, float x, 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" ); @@ -1201,17 +2218,265 @@ void Controller::HandleEvent( HandleType handleType, HandleState state, float x, } } +void Controller::PasteText( const std::string& stringToPaste ) +{ + InsertText( stringToPaste, Text::Controller::COMMIT ); + mImpl->ChangeState( EventData::EDITING ); + mImpl->RequestRelayout(); + + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); +} + +void Controller::PasteClipboardItemEvent() +{ + // 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(); + + // Paste + PasteText( stringToPaste ); +} + +void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) +{ + if( NULL == mImpl->mEventData ) + { + return; + } + + switch( button ) + { + case Toolkit::TextSelectionPopup::CUT: + { + mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text + mImpl->mOperationsPending = ALL_OPERATIONS; + + // This is to reset the virtual keyboard to Upper-case + if( 0u == mImpl->mLogicalModel->mText.Count() ) + { + NotifyImfManager(); + } + + if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || + !mImpl->IsPlaceholderAvailable() ) + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + else + { + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + } + mImpl->RequestRelayout(); + mImpl->mControlInterface.TextChanged(); + break; + } + case Toolkit::TextSelectionPopup::COPY: + { + mImpl->SendSelectionToClipboard( false ); // Text not modified + mImpl->RequestRelayout(); // 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( mImpl->mEventData->mSelectionEnabled ) + { + // Creates a SELECT event. + SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false ); + } + break; + } + case Toolkit::TextSelectionPopup::SELECT_ALL: + { + // Creates a SELECT_ALL event + SelectEvent( 0.f, 0.f, true ); + break; + } + case Toolkit::TextSelectionPopup::CLIPBOARD: + { + mImpl->ShowClipboard(); + break; + } + case Toolkit::TextSelectionPopup::NONE: + { + // Nothing to do. + break; + } + } +} + +ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) +{ + bool update = false; + bool requestRelayout = false; + + std::string text; + unsigned int cursorPosition = 0u; + + switch( imfEvent.eventName ) + { + case ImfManager::COMMIT: + { + InsertText( imfEvent.predictiveString, Text::Controller::COMMIT ); + update = true; + requestRelayout = true; + break; + } + case ImfManager::PREEDIT: + { + InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT ); + update = true; + requestRelayout = true; + break; + } + case ImfManager::DELETESURROUNDING: + { + update = RemoveText( imfEvent.cursorOffset, imfEvent.numberOfChars ); + + if( update ) + { + if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || + !mImpl->IsPlaceholderAvailable() ) + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + else + { + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + } + } + requestRelayout = true; + break; + } + case ImfManager::GETSURROUNDING: + { + GetText( text ); + cursorPosition = GetLogicalCursorPosition(); + + imfManager.SetSurroundingText( text ); + imfManager.SetCursorPosition( cursorPosition ); + break; + } + case ImfManager::VOID: + { + // do nothing + break; + } + } // end switch + + if( ImfManager::GETSURROUNDING != imfEvent.eventName ) + { + GetText( text ); + cursorPosition = GetLogicalCursorPosition(); + } + + if( requestRelayout ) + { + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->RequestRelayout(); + + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); + } + + ImfManager::ImfCallbackData callbackData( update, cursorPosition, text, false ); + + return callbackData; +} + Controller::~Controller() { delete mImpl; } +bool Controller::BackspaceKeyEvent() +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE\n", this ); + + bool removed = false; + + if( NULL == mImpl->mEventData ) + { + return removed; + } + + // IMF manager is no longer handling key-events + mImpl->ClearPreEditFlag(); + + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + removed = RemoveSelectedText(); + } + else if( mImpl->mEventData->mPrimaryCursorPosition > 0 ) + { + // Remove the character before the current cursor position + removed = RemoveText( -1, 1 ); + } + + if( removed ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE RemovedText\n", this ); + // Notifiy the IMF manager after text changed + // Automatic Upper-case and restarting prediction on an existing word require this. + NotifyImfManager(); + + if( ( 0u != mImpl->mLogicalModel->mText.Count() ) || + !mImpl->IsPlaceholderAvailable() ) + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + else + { + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + } + } + + return removed; +} + +void Controller::NotifyImfManager() +{ + if( NULL != mImpl->mEventData ) + { + if( mImpl->mEventData->mImfManager ) + { + // Notifying IMF of a cursor change triggers a surrounding text request so updating it now. + std::string text; + GetText( text ); + mImpl->mEventData->mImfManager.SetSurroundingText( text ); + + mImpl->mEventData->mImfManager.SetCursorPosition( GetLogicalCursorPosition() ); + mImpl->mEventData->mImfManager.NotifyCursorPosition(); + } + } +} + void Controller::ShowPlaceholderText() { if( mImpl->IsPlaceholderAvailable() ) { DALI_ASSERT_DEBUG( mImpl->mEventData && "No placeholder text available" ); + if( NULL == mImpl->mEventData ) + { + return; + } + mImpl->mEventData->mIsShowingPlaceholderText = true; // Disable handles when showing place-holder text @@ -1223,8 +2488,8 @@ void Controller::ShowPlaceholderText() size_t size( 0 ); // TODO - Switch placeholder text styles when changing state - if( EventData::INACTIVE != mImpl->mEventData->mState && - 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) + if( ( EventData::INACTIVE != mImpl->mEventData->mState ) && + ( 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) ) { text = mImpl->mEventData->mPlaceholderTextActive.c_str(); size = mImpl->mEventData->mPlaceholderTextActive.size(); @@ -1260,6 +2525,8 @@ void Controller::ShowPlaceholderText() // Apply modifications to the model mImpl->mOperationsPending = ALL_OPERATIONS; + + // Update the rest of the model during size negotiation mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); } } @@ -1283,6 +2550,7 @@ void Controller::ClearModelData() mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); mImpl->mVisualModel->mGlyphPositions.Clear(); mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->mColorRuns.Clear(); mImpl->mVisualModel->ClearCaches(); } @@ -1300,6 +2568,12 @@ void Controller::ClearFontData() mImpl->mVisualModel->ClearCaches(); } +void Controller::ClearStyleData() +{ + mImpl->mLogicalModel->mColorRuns.Clear(); + mImpl->mLogicalModel->ClearFontDescriptionRuns(); +} + Controller::Controller( ControlInterface& controlInterface ) : mImpl( NULL ) {