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=af0698694314e0cb967fbc16f03de046027ef14c;hp=47b0115f3e3190af02cfc4e3407611993031aeba;hb=27c3ff64b7236bb404bd931259674094390d63a1;hpb=5a984a1705bf94f17a8ef6a05ce170d1a47e49b1 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 47b0115..af06986 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -20,44 +20,32 @@ // EXTERNAL INCLUDES #include -#include +#include #include -#include +#include // INTERNAL INCLUDES #include #include -#include #include -#include #include #include #include #include +#include #include #include -#include - -using std::vector; namespace { -const float MAX_FLOAT = std::numeric_limits::max(); -const std::string EMPTY_STRING; +#if defined(DEBUG_ENABLED) + Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS"); +#endif -enum ModifyType -{ - REPLACE_TEXT, ///< Replace the entire text - INSERT_TEXT, ///< Insert characters at the current cursor position - DELETE_TEXT ///< Delete a character at the current cursor position -}; +const float MAX_FLOAT = std::numeric_limits::max(); -struct ModifyEvent -{ - ModifyType type; - std::string text; -}; +const std::string EMPTY_STRING(""); } // namespace @@ -70,592 +58,156 @@ namespace Toolkit namespace Text { -struct Controller::TextInput +ControllerPtr Controller::New( ControlInterface& controlInterface ) { - // Used to queue input events until DoRelayout() - enum EventType - { - KEYBOARD_FOCUS_GAIN_EVENT, - KEYBOARD_FOCUS_LOST_EVENT, - CURSOR_KEY_EVENT, - TAP_EVENT, - PAN_EVENT, - GRAB_HANDLE_EVENT - }; - - union Param - { - int mInt; - unsigned int mUint; - float mFloat; - }; + return ControllerPtr( new Controller( controlInterface ) ); +} - struct Event +void Controller::EnableTextInput( DecoratorPtr decorator ) +{ + if( !mImpl->mEventData ) { - Event( EventType eventType ) - : type( eventType ) - { - p1.mInt = 0; - p2.mInt = 0; - } + mImpl->mEventData = new EventData( decorator ); + } +} - EventType type; - Param p1; - Param p2; - Param p3; - }; +void Controller::SetText( const std::string& text ) +{ + // Cancel previously queued inserts etc. + mImpl->mModifyEvents.clear(); - enum State - { - INACTIVE, - SELECTING, - EDITING - }; - - TextInput( LogicalModelPtr logicalModel, - VisualModelPtr visualModel, - DecoratorPtr decorator ) - : mLogicalModel( logicalModel ), - mVisualModel( visualModel ), - mDecorator( decorator ), - mState( INACTIVE ), - mPrimaryCursorPosition( 0u ), - mSecondaryCursorPosition( 0u ), - mDecoratorUpdated( false ), - mCursorBlinkEnabled( true ), - mGrabHandleEnabled( false ), - mGrabHandlePopupEnabled( false ), - mSelectionEnabled( false ), - mHorizontalScrollingEnabled( true ), - mVerticalScrollingEnabled( false ), - mUpdateCursorPosition( false ) - { - } + // Remove the previously set text + ResetText(); - /** - * @brief Helper to move the cursor, grab handle etc. - */ - bool ProcessInputEvents( const Vector2& controlSize ) + if( ! text.empty() ) { - mDecoratorUpdated = false; - - if( mDecorator ) - { - for( vector::iterator iter = mEventQueue.begin(); iter != mEventQueue.end(); ++iter ) - { - switch( iter->type ) - { - case KEYBOARD_FOCUS_GAIN_EVENT: - { - OnKeyboardFocus( true ); - break; - } - case KEYBOARD_FOCUS_LOST_EVENT: - { - OnKeyboardFocus( false ); - break; - } - case CURSOR_KEY_EVENT: - { - OnCursorKeyEvent( *iter ); - break; - } - case TAP_EVENT: - { - OnTapEvent( *iter ); - break; - } - case PAN_EVENT: - { - OnPanEvent( *iter, controlSize ); - break; - } - case GRAB_HANDLE_EVENT: - { - OnGrabHandleEvent( *iter ); - break; - } - } - } - } + // Convert text into UTF-32 + Vector& utf32Characters = mImpl->mLogicalModel->mText; + utf32Characters.Resize( text.size() ); - // The cursor must also be repositioned after inserts into the model - if( mUpdateCursorPosition ) - { - UpdateCursorPosition(); - mUpdateCursorPosition = false; - } + // This is a bit horrible but std::string returns a (signed) char* + const uint8_t* utf8 = reinterpret_cast( text.c_str() ); - mEventQueue.clear(); + // 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() ); + utf32Characters.Resize( characterCount ); - return mDecoratorUpdated; - } + 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() ); - void OnKeyboardFocus( bool hasFocus ) - { - if( !hasFocus ) - { - ChangeState( INACTIVE ); - } - else + // Reset the cursor position + if( mImpl->mEventData ) { - ChangeState( EDITING ); + mImpl->mEventData->mPrimaryCursorPosition = characterCount; } - } - void OnCursorKeyEvent( const Event& event ) - { - int keyCode = event.p1.mInt; - - if( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) - { - // TODO - } - else if( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) - { - // TODO - } - else if( Dali::DALI_KEY_CURSOR_UP == keyCode ) - { - // TODO - } - else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) - { - // TODO - } + // Update the rest of the model during size negotiation + mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); } - - void HandleCursorKey( int keyCode ) + else { - // TODO + ShowPlaceholderText(); } - void OnTapEvent( const Event& event ) + if( mImpl->mEventData ) { - unsigned int tapCount = event.p1.mUint; - - if( 1u == tapCount ) - { - ChangeState( EDITING ); - - float xPosition = event.p2.mFloat; - float yPosition = event.p3.mFloat; - float height(0.0f); - GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); - mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); - mUpdateCursorPosition = false; - - mDecoratorUpdated = true; - } - else if( mSelectionEnabled && - 2u == tapCount ) - { - ChangeState( SELECTING ); - } + // Cancel previously queued events + mImpl->mEventData->mEventQueue.clear(); } - void OnPanEvent( const Event& event, const Vector2& controlSize ) - { - int state = event.p1.mInt; - - if( Gesture::Started == state || - Gesture::Continuing == state ) - { - const Vector2& actualSize = mVisualModel->GetActualSize(); - - if( mHorizontalScrollingEnabled ) - { - float displacementX = event.p2.mFloat; - mScrollPosition.x += displacementX; - - // Clamp between -space & 0 - float contentWidth = actualSize.width; - float space = (contentWidth > controlSize.width) ? contentWidth - controlSize.width : 0.0f; - mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x; - mScrollPosition.x = ( mScrollPosition.x > 0 ) ? 0 : mScrollPosition.x; - - mDecoratorUpdated = true; - } - if( mVerticalScrollingEnabled ) - { - float displacementY = event.p3.mFloat; - mScrollPosition.y += displacementY; - - // Clamp between -space & 0 - float space = (actualSize.height > controlSize.height) ? actualSize.height - controlSize.height : 0.0f; - mScrollPosition.y = ( mScrollPosition.y < -space ) ? -space : mScrollPosition.y; - mScrollPosition.y = ( mScrollPosition.y > 0 ) ? 0 : mScrollPosition.y; - - mDecoratorUpdated = true; - } - } - } + // Reset keyboard as text changed + mImpl->PreEditReset(); +} - void OnGrabHandleEvent( const Event& event ) +void Controller::GetText( std::string& text ) const +{ + if( ! mImpl->IsShowingPlaceholderText() ) { - unsigned int state = event.p1.mUint; + Vector& utf32Characters = mImpl->mLogicalModel->mText; - if( GRAB_HANDLE_PRESSED == state ) + if( 0u != utf32Characters.Count() ) { - float xPosition = event.p2.mFloat; - float yPosition = event.p3.mFloat; - float height(0.0f); - - GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); - - mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); - mDecorator->HidePopup(); - mDecoratorUpdated = true; - } - else if ( mGrabHandlePopupEnabled && - GRAB_HANDLE_RELEASED == state ) - { - mDecorator->ShowPopup(); + Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), text ); } } - - void ChangeState( State newState ) + else { - if( mState != newState ) - { - mState = newState; - - if( INACTIVE == mState ) - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE ); - mDecorator->StopCursorBlink(); - mDecorator->SetGrabHandleActive( false ); - mDecorator->SetSelectionActive( false ); - mDecorator->HidePopup(); - mDecoratorUpdated = true; - } - else if ( SELECTING == mState ) - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE ); - mDecorator->StopCursorBlink(); - mDecorator->SetGrabHandleActive( false ); - mDecorator->SetSelectionActive( true ); - mDecoratorUpdated = true; - } - else if( EDITING == mState ) - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY ); - if( mCursorBlinkEnabled ) - { - mDecorator->StartCursorBlink(); - } - if( mGrabHandleEnabled ) - { - mDecorator->SetGrabHandleActive( true ); - } - mDecorator->SetSelectionActive( false ); - mDecoratorUpdated = true; - } - } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::GetText %p empty (but showing placeholder)\n", this ); } +} - LineIndex GetClosestLine( float y ) +unsigned int Controller::GetLogicalCursorPosition() const +{ + if( mImpl->mEventData ) { - LineIndex lineIndex( 0u ); - - const Vector& lines = mVisualModel->mLines; - for( float totalHeight = 0; lineIndex < lines.Count(); ++lineIndex ) - { - totalHeight += lines[lineIndex].lineSize.height; - if( y < totalHeight ) - { - break; - } - } - - return lineIndex; + return mImpl->mEventData->mPrimaryCursorPosition; } - void GetClosestCursorPosition( CharacterIndex& logical, float& visualX, float& visualY, float& height ) - { - Length numberOfGlyphs = mVisualModel->mGlyphs.Count(); - Length numberOfLines = mVisualModel->mLines.Count(); - if( 0 == numberOfGlyphs || - 0 == numberOfLines ) - { - return; - } - - // Transform to visual model coords - visualX -= mScrollPosition.x; - visualY -= mScrollPosition.y; - - // Find which line is closest - LineIndex lineIndex( GetClosestLine( visualY ) ); - - const Vector& glyphs = mVisualModel->mGlyphs; - const GlyphInfo* const glyphsBuffer = glyphs.Begin(); - - const Vector& positions = mVisualModel->mGlyphPositions; - const Vector2* const positionsBuffer = positions.Begin(); - - unsigned int closestGlyph = 0; - bool leftOfGlyph( false ); // which side of the glyph? - float closestDistance = MAX_FLOAT; - - const LineRun& line = mVisualModel->mLines[lineIndex]; - GlyphIndex startGlyph = line.glyphIndex; - GlyphIndex endGlyph = line.glyphIndex + line.numberOfGlyphs; - DALI_ASSERT_DEBUG( endGlyph <= glyphs.Count() && "Invalid line info" ); - - for( GlyphIndex i = startGlyph; i < endGlyph; ++i ) - { - const GlyphInfo& glyphInfo = *( glyphsBuffer + i ); - const Vector2& position = *( positionsBuffer + i ); - float glyphX = position.x + glyphInfo.width*0.5f; - float glyphY = position.y + glyphInfo.height*0.5f; - - float distanceToGlyph = fabsf( glyphX - visualX ) + fabsf( glyphY - visualY ); - - if( distanceToGlyph < closestDistance ) - { - closestDistance = distanceToGlyph; - closestGlyph = i; - leftOfGlyph = ( visualX < glyphX ); - } - } - - // Calculate the logical position - logical = mVisualModel->GetCharacterIndex( closestGlyph ); - - // Returns the visual position of the glyph - visualX = positions[closestGlyph].x; - if( !leftOfGlyph ) - { - visualX += glyphs[closestGlyph].width; - - //if( LTR ) TODO - ++logical; - } - else// if ( RTL ) TODO - { - //++logical; - } - visualY = 0.0f; - - height = line.lineSize.height; - } + return 0u; +} - void UpdateCursorPosition() +void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text ) +{ + if( mImpl->mEventData ) { - if( 0 == mVisualModel->mGlyphs.Count() ) - { - return; - } - - // FIXME GetGlyphIndex() is behaving strangely -#if 0 - GlyphIndex cursorGlyph = mVisualModel->GetGlyphIndex( mPrimaryCursorPosition ); -#else - GlyphIndex cursorGlyph( 0u ); - for( cursorGlyph = 0; cursorGlyph < mVisualModel->mGlyphs.Count(); ++cursorGlyph ) + if( PLACEHOLDER_TYPE_INACTIVE == type ) { - if( mPrimaryCursorPosition == mVisualModel->GetCharacterIndex( cursorGlyph ) ) - { - break; - } + mImpl->mEventData->mPlaceholderTextInactive = text; } -#endif - - float visualX( 0.0f ); - float visualY( 0.0f ); - LineIndex lineIndex( 0u ); - const Vector& lineRuns = mVisualModel->mLines; - - if( cursorGlyph > 0 ) + else { - --cursorGlyph; - - visualX = mVisualModel->mGlyphPositions[ cursorGlyph ].x; - //if( LTR ) TODO - visualX += mVisualModel->mGlyphs[ cursorGlyph ].width; - - // Find the line height - for( GlyphIndex lastGlyph = 0; lineIndex < lineRuns.Count(); ++lineIndex ) - { - lastGlyph = (lineRuns[lineIndex].glyphIndex + lineRuns[lineIndex].numberOfGlyphs); - if( cursorGlyph < lastGlyph ) - { - break; - } - } + mImpl->mEventData->mPlaceholderTextActive = text; } - mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, lineRuns[lineIndex].lineSize.height ); - mDecoratorUpdated = true; + ShowPlaceholderText(); } +} - LogicalModelPtr mLogicalModel; - VisualModelPtr mVisualModel; - DecoratorPtr mDecorator; - - std::string mPlaceholderText; - - /** - * This is used to delay handling events until after the model has been updated. - * The number of updates to the model is minimized to improve performance. - */ - vector mEventQueue; ///< The queue of touch events etc. - - State mState; ///< Selection mode, edit mode etc. - - CharacterIndex mPrimaryCursorPosition; ///< Index into logical model for primary cursor - CharacterIndex mSecondaryCursorPosition; ///< Index into logical model for secondary cursor - - /** - * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control. - * Typically this will have a negative value with scrolling occurs. - */ - Vector2 mScrollPosition; ///< The text is offset by this position when scrolling. - - bool mDecoratorUpdated : 1; ///< True if the decorator was updated during event processing - bool mCursorBlinkEnabled : 1; ///< True if cursor should blink when active - bool mGrabHandleEnabled : 1; ///< True if grab handle is enabled - bool mGrabHandlePopupEnabled : 1; ///< True if the grab handle popu-up should be shown - bool mSelectionEnabled : 1; ///< True if selection handles, highlight etc. are enabled - bool mHorizontalScrollingEnabled : 1; ///< True if horizontal scrolling is enabled - bool mVerticalScrollingEnabled : 1; ///< True if vertical scrolling is enabled - bool mUpdateCursorPosition : 1; ///< True if the visual position of the cursor must be recalculated -}; - -struct Controller::FontDefaults +void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const { - FontDefaults() - : mDefaultPointSize(0.0f), - mFontId(0u) + if( mImpl->mEventData ) { - } - - FontId GetFontId( TextAbstraction::FontClient& fontClient ) - { - if( !mFontId ) + if( PLACEHOLDER_TYPE_INACTIVE == type ) { - Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; - mFontId = fontClient.GetFontId( mDefaultFontFamily, mDefaultFontStyle, pointSize ); + text = mImpl->mEventData->mPlaceholderTextInactive; + } + else + { + text = mImpl->mEventData->mPlaceholderTextActive; } - - return mFontId; - } - - std::string mDefaultFontFamily; - std::string mDefaultFontStyle; - float mDefaultPointSize; - FontId mFontId; -}; - -struct Controller::Impl -{ - Impl( ControlInterface& controlInterface ) - : mControlInterface( controlInterface ), - mLogicalModel(), - mVisualModel(), - mFontDefaults( NULL ), - mTextInput( NULL ), - mFontClient(), - mView(), - mLayoutEngine(), - mModifyEvents(), - mControlSize(), - mOperationsPending( NO_OPERATION ), - mRecalculateNaturalSize( true ) - { - mLogicalModel = LogicalModel::New(); - mVisualModel = VisualModel::New(); - - mFontClient = TextAbstraction::FontClient::Get(); - - mView.SetVisualModel( mVisualModel ); - } - - ~Impl() - { - delete mTextInput; - } - - ControlInterface& mControlInterface; ///< Reference to the text controller. - LogicalModelPtr mLogicalModel; ///< Pointer to the logical model. - VisualModelPtr mVisualModel; ///< Pointer to the visual model. - FontDefaults* mFontDefaults; ///< Avoid allocating this when the user does not specify a font. - Controller::TextInput* mTextInput; ///< Avoid allocating everything for text input until EnableTextInput(). - TextAbstraction::FontClient mFontClient; ///< Handle to the font client. - View mView; ///< The view interface to the rendering back-end. - LayoutEngine mLayoutEngine; ///< The layout engine. - std::vector mModifyEvents; ///< Temporary stores the text set until the next relayout. - Size mControlSize; ///< The size of the control. - OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text. - bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated. -}; - -ControllerPtr Controller::New( ControlInterface& controlInterface ) -{ - return ControllerPtr( new Controller( controlInterface ) ); -} - -void Controller::SetText( const std::string& text ) -{ - // Cancel previously queued inserts etc. - mImpl->mModifyEvents.clear(); - - // Keep until size negotiation - ModifyEvent event; - event.type = REPLACE_TEXT; - event.text = text; - mImpl->mModifyEvents.push_back( event ); - - if( mImpl->mTextInput ) - { - // Cancel previously queued events - mImpl->mTextInput->mEventQueue.clear(); - - // TODO - Hide selection decorations - } -} - -void Controller::GetText( std::string& text ) const -{ - if( !mImpl->mModifyEvents.empty() && - REPLACE_TEXT == mImpl->mModifyEvents[0].type ) - { - text = mImpl->mModifyEvents[0].text; - } - else - { - // TODO - Convert from UTF-32 } } -void Controller::SetPlaceholderText( const std::string& text ) +void Controller::SetMaximumNumberOfCharacters( int maxCharacters ) { - if( !mImpl->mTextInput ) + if ( maxCharacters >= 0 ) { - mImpl->mTextInput->mPlaceholderText = text; + mImpl->mMaximumNumberOfCharacters = maxCharacters; } } -void Controller::GetPlaceholderText( std::string& text ) const +int Controller::GetMaximumNumberOfCharacters() { - if( !mImpl->mTextInput ) - { - text = mImpl->mTextInput->mPlaceholderText; - } + return mImpl->mMaximumNumberOfCharacters; } void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultFontFamily = defaultFontFamily; - mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID + + // Clear the font-specific data + ClearFontData(); + mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontFamily() const @@ -672,13 +224,18 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultFontStyle = defaultFontStyle; - mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID + + // Clear the font-specific data + ClearFontData(); + mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontStyle() const @@ -695,13 +252,18 @@ void Controller::SetDefaultPointSize( float pointSize ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultPointSize = pointSize; - mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID + + // Clear the font-specific data + ClearFontData(); + mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + mImpl->RequestRelayout(); } float Controller::GetDefaultPointSize() const @@ -714,49 +276,160 @@ float Controller::GetDefaultPointSize() const return 0.0f; } -void Controller::GetDefaultFonts( Vector& fonts, Length numberOfCharacters ) +void Controller::SetTextColor( const Vector4& textColor ) { - if( mImpl->mFontDefaults ) + mImpl->mTextColor = textColor; + + if( ! mImpl->IsShowingPlaceholderText() ) + { + mImpl->mVisualModel->SetTextColor( textColor ); + } +} + +const Vector4& Controller::GetTextColor() const +{ + return mImpl->mTextColor; +} + +bool Controller::RemoveText( int cursorOffset, int numberOfChars ) +{ + bool removed( false ); + + 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() ) + { + // 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 + numberOfChars) > currentText.Count() ) + { + numberOfChars = currentText.Count() - cursorIndex; + } + + if( cursorIndex >= 0 && + (cursorIndex + numberOfChars) <= currentText.Count() ) + { + Vector::Iterator first = currentText.Begin() + cursorIndex; + Vector::Iterator last = first + numberOfChars; + + currentText.Erase( first, last ); + + // Cursor position retreat + oldCursorIndex = cursorIndex; + + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfChars ); + removed = true; + } + } + + return removed; +} + +void Controller::SetPlaceholderTextColor( const Vector4& textColor ) +{ + if( mImpl->mEventData ) { - FontRun fontRun; - fontRun.characterRun.characterIndex = 0; - fontRun.characterRun.numberOfCharacters = numberOfCharacters; - fontRun.fontId = mImpl->mFontDefaults->GetFontId( mImpl->mFontClient ); - fontRun.isDefault = true; + mImpl->mEventData->mPlaceholderTextColor = textColor; + } - fonts.PushBack( fontRun ); + if( mImpl->IsShowingPlaceholderText() ) + { + mImpl->mVisualModel->SetTextColor( textColor ); } } -void Controller::EnableTextInput( DecoratorPtr decorator ) +const Vector4& Controller::GetPlaceholderTextColor() const { - if( !mImpl->mTextInput ) + if( mImpl->mEventData ) { - mImpl->mTextInput = new TextInput( mImpl->mLogicalModel, mImpl->mVisualModel, decorator ); + return mImpl->mEventData->mPlaceholderTextColor; } + + return Color::BLACK; +} + +void Controller::SetShadowOffset( const Vector2& shadowOffset ) +{ + mImpl->mVisualModel->SetShadowOffset( shadowOffset ); +} + +const Vector2& Controller::GetShadowOffset() const +{ + return mImpl->mVisualModel->GetShadowOffset(); +} + +void Controller::SetShadowColor( const Vector4& shadowColor ) +{ + mImpl->mVisualModel->SetShadowColor( shadowColor ); +} + +const Vector4& Controller::GetShadowColor() const +{ + return mImpl->mVisualModel->GetShadowColor(); +} + +void Controller::SetUnderlineColor( const Vector4& color ) +{ + mImpl->mVisualModel->SetUnderlineColor( color ); +} + +const Vector4& Controller::GetUnderlineColor() const +{ + return mImpl->mVisualModel->GetUnderlineColor(); +} + +void Controller::SetUnderlineEnabled( bool enabled ) +{ + mImpl->mVisualModel->SetUnderlineEnabled( enabled ); +} + +bool Controller::IsUnderlineEnabled() const +{ + return mImpl->mVisualModel->IsUnderlineEnabled(); +} + +void Controller::SetUnderlineHeight( float height ) +{ + mImpl->mVisualModel->SetUnderlineHeight( height ); +} + +float Controller::GetUnderlineHeight() const +{ + return mImpl->mVisualModel->GetUnderlineHeight(); } void Controller::SetEnableCursorBlink( bool enable ) { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "TextInput disabled" ); + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - mImpl->mTextInput->mCursorBlinkEnabled = enable; + mImpl->mEventData->mCursorBlinkEnabled = enable; if( !enable && - mImpl->mTextInput->mDecorator ) + mImpl->mEventData->mDecorator ) { - mImpl->mTextInput->mDecorator->StopCursorBlink(); + mImpl->mEventData->mDecorator->StopCursorBlink(); } } } bool Controller::GetEnableCursorBlink() const { - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - return mImpl->mTextInput->mCursorBlinkEnabled; + return mImpl->mEventData->mCursorBlinkEnabled; } return false; @@ -764,16 +437,22 @@ bool Controller::GetEnableCursorBlink() const const Vector2& Controller::GetScrollPosition() const { - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - return mImpl->mTextInput->mScrollPosition; + 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 @@ -791,7 +470,7 @@ Vector3 Controller::GetNaturalSize() SHAPE_TEXT | GET_GLYPH_METRICS ); // Make sure the model is up-to-date before layouting - UpdateModel( onlyOnceOperations ); + mImpl->UpdateModel( onlyOnceOperations ); // Operations that need to be done if the size changes. const OperationsMask sizeOperations = static_cast( LAYOUT | @@ -814,10 +493,14 @@ Vector3 Controller::GetNaturalSize() 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 ); } return naturalSize; @@ -825,6 +508,7 @@ Vector3 Controller::GetNaturalSize() 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(); @@ -841,7 +525,7 @@ float Controller::GetHeightForWidth( float width ) SHAPE_TEXT | GET_GLYPH_METRICS ); // Make sure the model is up-to-date before layouting - UpdateModel( onlyOnceOperations ); + mImpl->UpdateModel( onlyOnceOperations ); // Operations that need to be done if the size changes. const OperationsMask sizeOperations = static_cast( LAYOUT | @@ -858,17 +542,21 @@ 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(); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height ); } return layoutSize.height; } -bool Controller::Relayout( const Vector2& size ) +bool Controller::Relayout( const Size& size ) { + 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 ); @@ -877,13 +565,15 @@ bool Controller::Relayout( const Vector2& size ) mImpl->mVisualModel->SetGlyphPositions( NULL, 0u ); glyphsRemoved = true; } - // Not worth to relayout if width or height is equal to zero. + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n" ); return glyphsRemoved; } if( size != mImpl->mControlSize ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mControlSize.width, mImpl->mControlSize.height ); + // Operations that need to be done if the size changes. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT | @@ -896,7 +586,7 @@ bool Controller::Relayout( const Vector2& size ) // Make sure the model is up-to-date before layouting ProcessModifyEvents(); - UpdateModel( mImpl->mOperationsPending ); + mImpl->UpdateModel( mImpl->mOperationsPending ); Size layoutSize; bool updated = DoRelayout( mImpl->mControlSize, @@ -906,12 +596,16 @@ bool Controller::Relayout( const Vector2& size ) // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; - if( mImpl->mTextInput ) + // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated. + CalculateTextAlignment( size ); + + if( mImpl->mEventData ) { // Move the cursor, grab handle etc. - updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize ) || updated; + updated = mImpl->ProcessInputEvents() || updated; } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout\n" ); return updated; } @@ -921,20 +615,24 @@ void Controller::ProcessModifyEvents() for( unsigned int i=0; iIsShowingPlaceholderText() ) + { + TextDeletedEvent(); + } } } @@ -942,310 +640,96 @@ void Controller::ProcessModifyEvents() events.clear(); } -void Controller::ReplaceTextEvent( const std::string& text ) +void Controller::ResetText() { // Reset buffers. mImpl->mLogicalModel->mText.Clear(); - mImpl->mLogicalModel->mScriptRuns.Clear(); - mImpl->mLogicalModel->mFontRuns.Clear(); - mImpl->mLogicalModel->mLineBreakInfo.Clear(); - mImpl->mLogicalModel->mWordBreakInfo.Clear(); - mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); - mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); - mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); - mImpl->mLogicalModel->mVisualToLogicalMap.Clear(); - mImpl->mVisualModel->mGlyphs.Clear(); - mImpl->mVisualModel->mGlyphsToCharacters.Clear(); - mImpl->mVisualModel->mCharactersToGlyph.Clear(); - mImpl->mVisualModel->mCharactersPerGlyph.Clear(); - mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); - mImpl->mVisualModel->mGlyphPositions.Clear(); - mImpl->mVisualModel->mLines.Clear(); - - // 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() ); - - // 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() ); - utf32Characters.Resize( characterCount ); + ClearModelData(); // Reset the cursor position - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - mImpl->mTextInput->mPrimaryCursorPosition = characterCount; - // TODO - handle secondary cursor + mImpl->mEventData->mPrimaryCursorPosition = 0; } + // We have cleared everything including the placeholder-text + mImpl->PlaceholderCleared(); + // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; // Apply modifications to the model mImpl->mOperationsPending = ALL_OPERATIONS; - UpdateModel( ALL_OPERATIONS ); - mImpl->mOperationsPending = static_cast( LAYOUT | - ALIGN | - UPDATE_ACTUAL_SIZE | - REORDER ); } -void Controller::InsertTextEvent( const std::string& text ) +void Controller::TextReplacedEvent() { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); - - // TODO - Optimize this - mImpl->mLogicalModel->mScriptRuns.Clear(); - mImpl->mLogicalModel->mFontRuns.Clear(); - mImpl->mLogicalModel->mLineBreakInfo.Clear(); - mImpl->mLogicalModel->mWordBreakInfo.Clear(); - mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); - mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); - mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); - mImpl->mLogicalModel->mVisualToLogicalMap.Clear(); - mImpl->mVisualModel->mGlyphs.Clear(); - mImpl->mVisualModel->mGlyphsToCharacters.Clear(); - mImpl->mVisualModel->mCharactersToGlyph.Clear(); - mImpl->mVisualModel->mCharactersPerGlyph.Clear(); - mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); - mImpl->mVisualModel->mGlyphPositions.Clear(); - mImpl->mVisualModel->mLines.Clear(); - - // Convert text into UTF-32 - Vector utf32Characters; - 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() ); - - // 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() ); - utf32Characters.Resize( characterCount ); + // Reset buffers. + ClearModelData(); - // Insert at current cursor position - Vector& modifyText = mImpl->mLogicalModel->mText; - CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; - if( cursorIndex < modifyText.Count() ) - { - modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.End() ); - } - else - { - modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.End() ); - } + // Apply modifications to the model + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->UpdateModel( ALL_OPERATIONS ); + mImpl->mOperationsPending = static_cast( LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + REORDER ); +} + +void Controller::TextInsertedEvent() +{ + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" ); - // Advance the cursor position - ++cursorIndex; + // TODO - Optimize this + ClearModelData(); // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; - UpdateModel( ALL_OPERATIONS ); + mImpl->UpdateModel( ALL_OPERATIONS ); mImpl->mOperationsPending = static_cast( LAYOUT | ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mTextInput->mUpdateCursorPosition = true; + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; } -void Controller::DeleteTextEvent() +void Controller::TextDeletedEvent() { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" ); // TODO - Optimize this - mImpl->mLogicalModel->mScriptRuns.Clear(); - mImpl->mLogicalModel->mFontRuns.Clear(); - mImpl->mLogicalModel->mLineBreakInfo.Clear(); - mImpl->mLogicalModel->mWordBreakInfo.Clear(); - mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); - mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); - mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); - mImpl->mLogicalModel->mVisualToLogicalMap.Clear(); - mImpl->mVisualModel->mGlyphs.Clear(); - mImpl->mVisualModel->mGlyphsToCharacters.Clear(); - mImpl->mVisualModel->mCharactersToGlyph.Clear(); - mImpl->mVisualModel->mCharactersPerGlyph.Clear(); - mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); - mImpl->mVisualModel->mGlyphPositions.Clear(); - mImpl->mVisualModel->mLines.Clear(); - - // Delte at current cursor position - Vector& modifyText = mImpl->mLogicalModel->mText; - CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; - - if( cursorIndex > 0 && - cursorIndex-1 < modifyText.Count() ) - { - modifyText.Remove( modifyText.Begin() + cursorIndex - 1 ); - - // Cursor position retreat - --cursorIndex; - } + ClearModelData(); // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; - UpdateModel( ALL_OPERATIONS ); + mImpl->UpdateModel( ALL_OPERATIONS ); mImpl->mOperationsPending = static_cast( LAYOUT | ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mTextInput->mUpdateCursorPosition = true; -} - -void Controller::UpdateModel( OperationsMask operationsRequired ) -{ - // Calculate the operations to be done. - const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); - - Vector& utf32Characters = mImpl->mLogicalModel->mText; - - const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters(); - - Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; - if( GET_LINE_BREAKS & operations ) - { - // Retrieves the line break info. The line break info is used to split the text in 'paragraphs' to - // calculate the bidirectional info for each 'paragraph'. - // It's also used to layout the text (where it should be a new line) or to shape the text (text in different lines - // is not shaped together). - lineBreakInfo.Resize( numberOfCharacters, TextAbstraction::LINE_NO_BREAK ); - - SetLineBreakInfo( utf32Characters, - lineBreakInfo ); - } - - Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; - if( GET_WORD_BREAKS & operations ) - { - // Retrieves the word break info. The word break info is used to layout the text (where to wrap the text in lines). - wordBreakInfo.Resize( numberOfCharacters, TextAbstraction::WORD_NO_BREAK ); - - SetWordBreakInfo( utf32Characters, - wordBreakInfo ); - } - - const bool getScripts = GET_SCRIPTS & operations; - const bool validateFonts = VALIDATE_FONTS & operations; - - Vector& scripts = mImpl->mLogicalModel->mScriptRuns; - Vector& validFonts = mImpl->mLogicalModel->mFontRuns; - - if( getScripts || validateFonts ) - { - // Validates the fonts assigned by the application or assigns default ones. - // It makes sure all the characters are going to be rendered by the correct font. - MultilanguageSupport multilanguageSupport = MultilanguageSupport::Get(); - - if( getScripts ) - { - // Retrieves the scripts used in the text. - multilanguageSupport.SetScripts( utf32Characters, - lineBreakInfo, - scripts ); - } - - if( validateFonts ) - { - if( 0u == validFonts.Count() ) - { - // Copy the requested font defaults received via the property system. - // These may not be valid i.e. may not contain glyphs for the necessary scripts. - GetDefaultFonts( validFonts, numberOfCharacters ); - } - - // Validates the fonts. If there is a character with no assigned font it sets a default one. - // After this call, fonts are validated. - multilanguageSupport.ValidateFonts( utf32Characters, - scripts, - validFonts ); - } - } - - Vector mirroredUtf32Characters; - bool textMirrored = false; - if( BIDI_INFO & operations ) - { - // Count the number of LINE_NO_BREAK to reserve some space for the vector of paragraph's - // bidirectional info. - - Length numberOfParagraphs = 0u; - - const TextAbstraction::LineBreakInfo* lineBreakInfoBuffer = lineBreakInfo.Begin(); - for( Length index = 0u; index < numberOfCharacters; ++index ) - { - if( TextAbstraction::LINE_NO_BREAK == *( lineBreakInfoBuffer + index ) ) - { - ++numberOfParagraphs; - } - } - - Vector& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo; - bidirectionalInfo.Reserve( numberOfParagraphs ); - - // Calculates the bidirectional info for the whole paragraph if it contains right to left scripts. - SetBidirectionalInfo( utf32Characters, - scripts, - lineBreakInfo, - bidirectionalInfo ); - - if( 0u != bidirectionalInfo.Count() ) - { - // This paragraph has right to left text. Some characters may need to be mirrored. - // TODO: consider if the mirrored string can be stored as well. - - textMirrored = GetMirroredText( utf32Characters, mirroredUtf32Characters ); - } - } - - Vector& glyphs = mImpl->mVisualModel->mGlyphs; - Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; - Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; - if( SHAPE_TEXT & operations ) - { - const Vector& textToShape = textMirrored ? mirroredUtf32Characters : utf32Characters; - // Shapes the text. - ShapeText( textToShape, - lineBreakInfo, - scripts, - validFonts, - glyphs, - glyphsToCharactersMap, - charactersPerGlyph ); - } - - const Length numberOfGlyphs = glyphs.Count(); - - if( GET_GLYPH_METRICS & operations ) - { - mImpl->mFontClient.GetGlyphMetrics( glyphs.Begin(), numberOfGlyphs ); - } - - if( 0u != numberOfGlyphs ) - { - // Create the glyph to character conversion table and the 'number of glyphs' per character. - mImpl->mVisualModel->CreateCharacterToGlyphTable(numberOfCharacters ); - mImpl->mVisualModel->CreateGlyphsPerCharacterTable( numberOfCharacters ); - } + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; } -bool Controller::DoRelayout( const Vector2& size, +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. @@ -1259,8 +743,16 @@ bool Controller::DoRelayout( const Vector2& size, Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs(); + if( 0u == numberOfGlyphs ) + { + // 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; @@ -1270,6 +762,7 @@ bool Controller::DoRelayout( const Vector2& size, mImpl->mLogicalModel->mText.Begin(), lineBreakInfo.Begin(), wordBreakInfo.Begin(), + ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, numberOfGlyphs, glyphs.Begin(), glyphsToCharactersMap.Begin(), @@ -1352,6 +845,7 @@ bool Controller::DoRelayout( const Vector2& size, if( ALIGN & operations ) { mImpl->mLayoutEngine.Align( layoutParameters, + layoutSize, lines, glyphPositions ); } @@ -1368,12 +862,72 @@ bool Controller::DoRelayout( const Vector2& size, layoutSize = mImpl->mVisualModel->GetActualSize(); } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); return viewUpdated; } -View& Controller::GetView() +void Controller::CalculateTextAlignment( const Size& size ) { - return mImpl->mView; + // Get the direction of the first character. + const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u ); + + 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( LayoutEngine::HORIZONTAL_ALIGN_BEGIN == horizontalAlignment ) + { + horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_END; + } + else + { + horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_BEGIN; + } + } + + 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; + } + } + + 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; + } + } } LayoutEngine& Controller::GetLayoutEngine() @@ -1381,42 +935,42 @@ LayoutEngine& Controller::GetLayoutEngine() return mImpl->mLayoutEngine; } -void Controller::RequestRelayout() +View& Controller::GetView() { - mImpl->mControlInterface.RequestTextRelayout(); + return mImpl->mView; } void Controller::KeyboardFocusGainEvent() { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyboardFocusGainEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::KEYBOARD_FOCUS_GAIN_EVENT ); - mImpl->mTextInput->mEventQueue.push_back( event ); + Event event( Event::KEYBOARD_FOCUS_GAIN_EVENT ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } void Controller::KeyboardFocusLostEvent() { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyboardFocusLostEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::KEYBOARD_FOCUS_LOST_EVENT ); - mImpl->mTextInput->mEventQueue.push_back( event ); + Event event( Event::KEYBOARD_FOCUS_LOST_EVENT ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); - if( mImpl->mTextInput && + if( mImpl->mEventData && keyEvent.state == KeyEvent::Down ) { int keyCode = keyEvent.keyCode; @@ -1433,77 +987,255 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) Dali::DALI_KEY_CURSOR_UP == keyCode || Dali::DALI_KEY_CURSOR_DOWN == keyCode ) { - TextInput::Event event( TextInput::CURSOR_KEY_EVENT ); + Event event( Event::CURSOR_KEY_EVENT ); event.p1.mInt = keyCode; - mImpl->mTextInput->mEventQueue.push_back( event ); + mImpl->mEventData->mEventQueue.push_back( event ); } else if( Dali::DALI_KEY_BACKSPACE == keyCode ) { - // Queue a delete event - ModifyEvent event; - event.type = DELETE_TEXT; - mImpl->mModifyEvents.push_back( event ); + // Remove the character before the current cursor position + bool removed = RemoveText( -1, 1 ); + + if( removed ) + { + if( 0u == mImpl->mLogicalModel->mText.Count() ) + { + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + } + else + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + } } - else if( !keyString.empty() ) + else { - // Queue an insert event - ModifyEvent event; - event.type = INSERT_TEXT; - event.text = keyString; - mImpl->mModifyEvents.push_back( event ); + InsertText( keyString, COMMIT ); } - RequestRelayout(); + mImpl->ChangeState( EventData::EDITING ); // todo Confirm this is the best place to change the state of + + mImpl->RequestRelayout(); } return false; } +void Controller::InsertText( const std::string& text, Controller::InsertType type ) +{ + bool removedPreEdit( 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( mImpl->IsShowingPlaceholderText() ) + { + ResetText(); + } + } + + if( mImpl->mEventData ) + { + 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(); + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); + } + + mImpl->mEventData->mPreEditFlag = true; + } + } + + 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* + const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + + // 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() ); + 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() ); + + const Length numberOfCharactersInModel = mImpl->mLogicalModel->GetNumberOfCharacters(); + + // Restrict new text to fit within Maximum characters setting + Length maxSizeOfNewText = std::min ( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); + maxLengthReached = ( characterCount > maxSizeOfNewText ); + + // Insert at current cursor position + CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; + + Vector& modifyText = mImpl->mLogicalModel->mText; + + if( cursorIndex < numberOfCharactersInModel ) + { + modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText ); + } + else + { + modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText ); + } + + 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 ); + } + + if( removedPreEdit || !text.empty() ) + { + // Queue an inserted event + mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED ); + } + + if( maxLengthReached ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", mImpl->mLogicalModel->mText.Count() ); + + mImpl->mControlInterface.MaxLengthReached(); + + mImpl->PreEditReset(); + } +} + void Controller::TapEvent( unsigned int tapCount, float x, float y ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected TapEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" ); + + if( NULL != mImpl->mEventData ) + { + if( 1u == tapCount ) + { + bool tapDuringEditMode( EventData::EDITING == mImpl->mEventData->mState ); + + mImpl->ChangeState( EventData::EDITING ); + + if( mImpl->IsShowingPlaceholderText() ) + { + // Alternative placeholder-text is used when editing + ShowPlaceholderText(); + } + else if( EventData::EDITING == mImpl->mEventData->mState ) + { + // Grab handle is not shown until a tap is received whilst EDITING + if( tapDuringEditMode ) + { + mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, true ); + } + mImpl->mEventData->mDecorator->SetPopupActive( false ); + } + } + else if( mImpl->mEventData->mSelectionEnabled && + ( 2u == tapCount ) ) + { + mImpl->ChangeState( EventData::SELECTING ); + } + } - if( mImpl->mTextInput ) + // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::TAP_EVENT ); + Event event( Event::TAP_EVENT ); event.p1.mUint = tapCount; event.p2.mFloat = x; event.p3.mFloat = y; - mImpl->mTextInput->mEventQueue.push_back( event ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } + + // Reset keyboard as tap event has occurred. + mImpl->PreEditReset(); } void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected PanEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::PAN_EVENT ); + Event event( Event::PAN_EVENT ); event.p1.mInt = state; event.p2.mFloat = displacement.x; event.p3.mFloat = displacement.y; - mImpl->mTextInput->mEventQueue.push_back( event ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } -void Controller::GrabHandleEvent( GrabHandleState state, float x, float y ) +void Controller::HandleEvent( HandleType handleType, HandleState state, float x, float y ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Controller::HandleEvent. Unexpected HandleEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::GRAB_HANDLE_EVENT ); - event.p1.mUint = state; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mTextInput->mEventQueue.push_back( event ); + switch( handleType ) + { + case GRAB_HANDLE: + { + Event event( Event::GRAB_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: + { + 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 HANDLE_TYPE_COUNT: + { + DALI_ASSERT_DEBUG( !"Controller::HandleEvent. Unexpected handle type" ); + } + } - RequestRelayout(); + mImpl->RequestRelayout(); } } @@ -1512,6 +1244,103 @@ Controller::~Controller() delete mImpl; } +void Controller::ShowPlaceholderText() +{ + if( mImpl->IsPlaceholderAvailable() ) + { + DALI_ASSERT_DEBUG( mImpl->mEventData && "No placeholder text available" ); + + mImpl->mEventData->mIsShowingPlaceholderText = true; + + // Cancel previously queued inserts etc. + mImpl->mModifyEvents.clear(); + + // Disable handles when showing place-holder text + mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, false ); + mImpl->mEventData->mDecorator->SetHandleActive( LEFT_SELECTION_HANDLE, false ); + mImpl->mEventData->mDecorator->SetHandleActive( RIGHT_SELECTION_HANDLE, false ); + + const char* text( NULL ); + size_t size( 0 ); + + // TODO - Switch placeholder text styles when changing state + if( EventData::INACTIVE != mImpl->mEventData->mState && + 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) + { + text = mImpl->mEventData->mPlaceholderTextActive.c_str(); + size = mImpl->mEventData->mPlaceholderTextActive.size(); + } + else + { + text = mImpl->mEventData->mPlaceholderTextInactive.c_str(); + size = mImpl->mEventData->mPlaceholderTextInactive.size(); + } + + // Reset model for showing placeholder. + mImpl->mLogicalModel->mText.Clear(); + ClearModelData(); + mImpl->mVisualModel->SetTextColor( mImpl->mEventData->mPlaceholderTextColor ); + + // Convert text into UTF-32 + Vector& utf32Characters = mImpl->mLogicalModel->mText; + utf32Characters.Resize( size ); + + // This is a bit horrible but std::string returns a (signed) char* + const uint8_t* utf8 = reinterpret_cast( text ); + + // Transform a text array encoded in utf8 into an array encoded in utf32. + // It returns the actual number of characters. + Length characterCount = Utf8ToUtf32( utf8, size, utf32Characters.Begin() ); + utf32Characters.Resize( characterCount ); + + // Reset the cursor position + mImpl->mEventData->mPrimaryCursorPosition = 0; + + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); + } +} + +void Controller::ClearModelData() +{ + // n.b. This does not Clear the mText from mLogicalModel + mImpl->mLogicalModel->mScriptRuns.Clear(); + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mLogicalModel->mLineBreakInfo.Clear(); + mImpl->mLogicalModel->mWordBreakInfo.Clear(); + mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); + mImpl->mLogicalModel->mCharacterDirections.Clear(); + mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); + mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); + mImpl->mLogicalModel->mVisualToLogicalMap.Clear(); + mImpl->mVisualModel->mGlyphs.Clear(); + mImpl->mVisualModel->mGlyphsToCharacters.Clear(); + mImpl->mVisualModel->mCharactersToGlyph.Clear(); + mImpl->mVisualModel->mCharactersPerGlyph.Clear(); + mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); + mImpl->mVisualModel->mGlyphPositions.Clear(); + mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); +} + +void Controller::ClearFontData() +{ + mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mVisualModel->mGlyphs.Clear(); + mImpl->mVisualModel->mGlyphsToCharacters.Clear(); + mImpl->mVisualModel->mCharactersToGlyph.Clear(); + mImpl->mVisualModel->mCharactersPerGlyph.Clear(); + mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); + mImpl->mVisualModel->mGlyphPositions.Clear(); + mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); +} + Controller::Controller( ControlInterface& controlInterface ) : mImpl( NULL ) {