X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=abbc2e7436212a170c14af449ac872b31d872d0d;hb=caa46059c4cd1c18f380b81487f83a395846e5df;hp=b4d4bb56013aae1c2cf5cf0cd10f7b88ff3f652b;hpb=d4324d0aaec66dd8104801c51ec87bbcdd356e6c;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 b4d4bb5..abbc2e7 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -20,44 +20,26 @@ // EXTERNAL INCLUDES #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; -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 -}; - -struct ModifyEvent -{ - ModifyType type; - std::string text; -}; +const std::string EMPTY_STRING(""); } // namespace @@ -70,372 +52,6 @@ namespace Toolkit namespace Text { -struct Controller::TextInput -{ - // Used to queue input events until DoRelayout() - enum EventType - { - KEYBOARD_FOCUS_GAIN_EVENT, - KEYBOARD_FOCUS_LOST_EVENT, - CURSOR_KEY_EVENT, - TAP_EVENT, - GRAB_HANDLE_EVENT - }; - - union Param - { - int mInt; - unsigned int mUint; - float mFloat; - }; - - struct Event - { - Event( EventType eventType ) - : type( eventType ) - { - p1.mInt = 0; - p2.mInt = 0; - } - - EventType type; - Param p1; - Param p2; - Param p3; - }; - - 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 ) - { - } - - /** - * @brief Helper to move the cursor, grab handle etc. - */ - bool ProcessInputEvents() - { - 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 GRAB_HANDLE_EVENT: - { - OnGrabHandleEvent( *iter ); - break; - } - } - } - } - - mEventQueue.clear(); - - return mDecoratorUpdated; - } - - void OnKeyboardFocus( bool hasFocus ) - { - if( !hasFocus ) - { - ChangeState( INACTIVE ); - } - else - { - ChangeState( EDITING ); - } - } - - 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 - } - } - - void HandleBackspaceKey() - { - // TODO - } - - void HandleCursorKey( int keyCode ) - { - // TODO - } - - void HandleKeyString( const char* keyString ) - { - // TODO - } - - void OnTapEvent( const Event& event ) - { - 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( xPosition, yPosition, height ); - mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); - - mDecoratorUpdated = true; - } - else if( 2u == tapCount ) - { - ChangeState( SELECTING ); - } - } - - void OnGrabHandleEvent( const Event& event ) - { - unsigned int state = event.p1.mUint; - - if( GRAB_HANDLE_PRESSED == state ) - { - float xPosition = event.p2.mFloat; - float yPosition = event.p3.mFloat; - float height(0.0f); - - GetClosestCursorPosition( xPosition, yPosition, height ); - - mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); - mDecorator->HidePopup(); - mDecoratorUpdated = true; - } - else if ( GRAB_HANDLE_RELEASED == state ) - { - mDecorator->ShowPopup(); - } - - } - - void ChangeState( State newState ) - { - 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(); - } - mDecorator->SetGrabHandleActive( true ); - mDecorator->SetSelectionActive( false ); - mDecoratorUpdated = true; - } - } - } - - void GetClosestCursorPosition( float& x, float& y, float& height ) - { - // TODO - Look at LineRuns first - - Text::Length numberOfGlyphs = mVisualModel->GetNumberOfGlyphs(); - if( 0 == numberOfGlyphs ) - { - return; - } - - Vector& glyphs = mVisualModel->mGlyphs; - const GlyphInfo* const glyphsBuffer = glyphs.Begin(); - - Vector& positions = mVisualModel->mGlyphPositions; - const Vector2* const positionsBuffer = positions.Begin(); - - unsigned int closestGlyph = 0; - float closestDistance = MAX_FLOAT; - - for( unsigned int i = 0, numberOfGLyphs = glyphs.Count(); i < numberOfGLyphs; ++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 - x ) + fabsf( glyphY - y ); - - if( distanceToGlyph < closestDistance ) - { - closestDistance = distanceToGlyph; - closestGlyph = i; - } - } - - // TODO - Consider RTL languages - x = positions[closestGlyph].x + glyphs[closestGlyph].width; - y = 0.0f; - - FontMetrics metrics; - TextAbstraction::FontClient::Get().GetFontMetrics( glyphs[closestGlyph].fontId, metrics ); - height = metrics.height; // TODO - Fix for multi-line - } - - 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 - - bool mDecoratorUpdated : 1; ///< True if the decorator was updated during event processing - bool mCursorBlinkEnabled : 1; ///< True if cursor should blink when active -}; - -struct Controller::FontDefaults -{ - FontDefaults() - : mDefaultPointSize(0.0f), - mFontId(0u) - { - } - - FontId GetFontId( TextAbstraction::FontClient& fontClient ) - { - if( !mFontId ) - { - Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; - mFontId = fontClient.GetFontId( mDefaultFontFamily, mDefaultFontStyle, pointSize ); - } - - 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 ) ); @@ -448,14 +64,14 @@ void Controller::SetText( const std::string& text ) // Keep until size negotiation ModifyEvent event; - event.type = REPLACE_TEXT; + event.type = ModifyEvent::REPLACE_TEXT; event.text = text; mImpl->mModifyEvents.push_back( event ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { // Cancel previously queued events - mImpl->mTextInput->mEventQueue.clear(); + mImpl->mEventData->mEventQueue.clear(); // TODO - Hide selection decorations } @@ -464,7 +80,7 @@ void Controller::SetText( const std::string& text ) void Controller::GetText( std::string& text ) const { if( !mImpl->mModifyEvents.empty() && - REPLACE_TEXT == mImpl->mModifyEvents[0].type ) + ModifyEvent::REPLACE_TEXT == mImpl->mModifyEvents[0].type ) { text = mImpl->mModifyEvents[0].text; } @@ -476,17 +92,17 @@ void Controller::GetText( std::string& text ) const void Controller::SetPlaceholderText( const std::string& text ) { - if( !mImpl->mTextInput ) + if( !mImpl->mEventData ) { - mImpl->mTextInput->mPlaceholderText = text; + mImpl->mEventData->mPlaceholderText = text; } } void Controller::GetPlaceholderText( std::string& text ) const { - if( !mImpl->mTextInput ) + if( !mImpl->mEventData ) { - text = mImpl->mTextInput->mPlaceholderText; + text = mImpl->mEventData->mPlaceholderText; } } @@ -494,13 +110,26 @@ 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 mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + // Clear the font-specific data + 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(); + + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontFamily() const @@ -517,13 +146,26 @@ 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 mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + // Clear the font-specific data + 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(); + + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontStyle() const @@ -540,13 +182,26 @@ 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 mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + // Clear the font-specific data + 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(); + + mImpl->RequestRelayout(); } float Controller::GetDefaultPointSize() const @@ -559,7 +214,7 @@ float Controller::GetDefaultPointSize() const return 0.0f; } -void Controller::GetDefaultFonts( Vector& fonts, Length numberOfCharacters ) +void Controller::GetDefaultFonts( Vector& fonts, Length numberOfCharacters ) const { if( mImpl->mFontDefaults ) { @@ -573,40 +228,115 @@ void Controller::GetDefaultFonts( Vector& fonts, Length numberOfCharact } } +void Controller::SetTextColor( const Vector4& textColor ) +{ + mImpl->mVisualModel->SetTextColor( textColor ); +} + +const Vector4& Controller::GetTextColor() const +{ + return mImpl->mVisualModel->GetTextColor(); +} + +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::EnableTextInput( DecoratorPtr decorator ) { - if( !mImpl->mTextInput ) + if( !mImpl->mEventData ) { - mImpl->mTextInput = new TextInput( mImpl->mLogicalModel, mImpl->mVisualModel, decorator ); + mImpl->mEventData = new EventData( decorator ); } } 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; } +const Vector2& Controller::GetScrollPosition() const +{ + if( mImpl->mEventData ) + { + return mImpl->mEventData->mScrollPosition; + } + + return Vector2::ZERO; +} + +const Vector2& Controller::GetAlignmentOffset() const +{ + return mImpl->mAlignmentOffset; +} + Vector3 Controller::GetNaturalSize() { Vector3 naturalSize; @@ -622,6 +352,7 @@ Vector3 Controller::GetNaturalSize() 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 @@ -629,6 +360,7 @@ Vector3 Controller::GetNaturalSize() // Operations that need to be done if the size changes. const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | REORDER ); DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), @@ -670,6 +402,7 @@ float Controller::GetHeightForWidth( float width ) 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 @@ -677,6 +410,7 @@ float Controller::GetHeightForWidth( float width ) // Operations that need to be done if the size changes. const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | REORDER ); DoRelayout( Size( width, MAX_FLOAT ), @@ -698,7 +432,7 @@ float Controller::GetHeightForWidth( float width ) return layoutSize.height; } -bool Controller::Relayout( const Vector2& size ) +bool Controller::Relayout( const Size& size ) { if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { @@ -708,7 +442,6 @@ 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. return glyphsRemoved; } @@ -718,6 +451,7 @@ bool Controller::Relayout( const Vector2& size ) // Operations that need to be done if the size changes. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT | + ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); @@ -736,10 +470,13 @@ 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() || updated; + updated = mImpl->ProcessInputEvents() || updated; } return updated; @@ -751,18 +488,18 @@ void Controller::ProcessModifyEvents() for( unsigned int i=0; imLogicalModel->mText.Clear(); 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(); // Convert text into UTF-32 Vector& utf32Characters = mImpl->mLogicalModel->mText; @@ -795,9 +544,9 @@ void Controller::ReplaceTextEvent( const std::string& text ) utf32Characters.Resize( characterCount ); // Reset the cursor position - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - mImpl->mTextInput->mPrimaryCursorPosition = characterCount; + mImpl->mEventData->mPrimaryCursorPosition = characterCount; // TODO - handle secondary cursor } @@ -807,14 +556,15 @@ void Controller::ReplaceTextEvent( const std::string& text ) // Apply modifications to the model mImpl->mOperationsPending = ALL_OPERATIONS; UpdateModel( ALL_OPERATIONS ); - mImpl->mOperationsPending = static_cast( LAYOUT | + mImpl->mOperationsPending = static_cast( LAYOUT | + ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); } void Controller::InsertTextEvent( const std::string& text ) { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertTextEvent" ); // TODO - Optimize this mImpl->mLogicalModel->mScriptRuns.Clear(); @@ -822,7 +572,18 @@ void Controller::InsertTextEvent( const std::string& text ) 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(); // Convert text into UTF-32 Vector utf32Characters; @@ -838,7 +599,7 @@ void Controller::InsertTextEvent( const std::string& text ) // Insert at current cursor position Vector& modifyText = mImpl->mLogicalModel->mText; - CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; if( cursorIndex < modifyText.Count() ) { @@ -858,14 +619,19 @@ void Controller::InsertTextEvent( const std::string& text ) // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; UpdateModel( ALL_OPERATIONS ); - mImpl->mOperationsPending = static_cast( LAYOUT | + mImpl->mOperationsPending = static_cast( LAYOUT | + ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); + + // Queue a cursor reposition event; this must wait until after DoRelayout() + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; } void Controller::DeleteTextEvent() { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertTextEvent" ); // TODO - Optimize this mImpl->mLogicalModel->mScriptRuns.Clear(); @@ -873,11 +639,22 @@ void Controller::DeleteTextEvent() 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(); // Delte at current cursor position Vector& modifyText = mImpl->mLogicalModel->mText; - CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; if( cursorIndex > 0 && cursorIndex-1 < modifyText.Count() ) @@ -894,9 +671,14 @@ void Controller::DeleteTextEvent() // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; UpdateModel( ALL_OPERATIONS ); - mImpl->mOperationsPending = static_cast( LAYOUT | + mImpl->mOperationsPending = static_cast( LAYOUT | + ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); + + // Queue a cursor reposition event; this must wait until after DoRelayout() + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; } void Controller::UpdateModel( OperationsMask operationsRequired ) @@ -968,6 +750,8 @@ void Controller::UpdateModel( OperationsMask operationsRequired ) } } + 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 @@ -992,21 +776,47 @@ void Controller::UpdateModel( OperationsMask operationsRequired ) 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 ); + + // Only set the character directions if there is right to left characters. + Vector& directions = mImpl->mLogicalModel->mCharacterDirections; + directions.Resize( numberOfCharacters ); + + GetCharactersDirection( bidirectionalInfo, + directions ); + } + else + { + // There is no right to left characters. Clear the directions vector. + mImpl->mLogicalModel->mCharacterDirections.Clear(); + } + + } 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( utf32Characters, + ShapeText( textToShape, lineBreakInfo, scripts, validFonts, glyphs, glyphsToCharactersMap, charactersPerGlyph ); + + // Create the 'number of glyphs' per character and the glyph to character conversion tables. + mImpl->mVisualModel->CreateGlyphsPerCharacterTable( numberOfCharacters ); + mImpl->mVisualModel->CreateCharacterToGlyphTable( numberOfCharacters ); } const Length numberOfGlyphs = glyphs.Count(); @@ -1015,16 +825,9 @@ void Controller::UpdateModel( OperationsMask operationsRequired ) { 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 ); - } } -bool Controller::DoRelayout( const Vector2& size, +bool Controller::DoRelayout( const Size& size, OperationsMask operationsRequired, Size& layoutSize ) { @@ -1039,19 +842,27 @@ bool Controller::DoRelayout( const Vector2& size, // after the first time the text has been laid out. // Fill the vectors again. - const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters(); Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs(); + if( 0u == numberOfGlyphs ) + { + // Nothing else to do if there is no glyphs. + 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; // Set the layout parameters. LayoutParameters layoutParameters( size, + mImpl->mLogicalModel->mText.Begin(), lineBreakInfo.Begin(), wordBreakInfo.Begin(), + ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, numberOfGlyphs, glyphs.Begin(), glyphsToCharactersMap.Begin(), @@ -1063,18 +874,16 @@ bool Controller::DoRelayout( const Vector2& size, // some re-allocations. Vector& lines = mImpl->mVisualModel->mLines; + // Delete any previous laid out lines before setting the new ones. + lines.Clear(); + + // The capacity of the bidirectional paragraph info is the number of paragraphs. + lines.Reserve( mImpl->mLogicalModel->mBidirectionalParagraphInfo.Capacity() ); + // Resize the vector of positions to have the same size than the vector of glyphs. Vector& glyphPositions = mImpl->mVisualModel->mGlyphPositions; glyphPositions.Resize( numberOfGlyphs ); - BidirectionalRunIndex firstBidiRunIndex = 0u; - Length numberOfBidiRuns = 0u; - mImpl->mLogicalModel->GetNumberOfBidirectionalInfoRuns( 0u, numberOfCharacters, firstBidiRunIndex, numberOfBidiRuns ); - - // Delete any previous laid out lines before setting the new ones. - lines.Clear(); - lines.Reserve( numberOfBidiRuns ); - // Update the visual model. viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, glyphPositions, @@ -1131,6 +940,14 @@ bool Controller::DoRelayout( const Vector2& size, free( bidiLineInfo.visualToLogicalMap ); } } + } // REORDER + + if( ALIGN & operations ) + { + mImpl->mLayoutEngine.Align( layoutParameters, + layoutSize, + lines, + glyphPositions ); } // Sets the actual size. @@ -1138,7 +955,7 @@ bool Controller::DoRelayout( const Vector2& size, { mImpl->mVisualModel->SetActualSize( layoutSize ); } - } + } // view updated } else { @@ -1148,9 +965,68 @@ bool Controller::DoRelayout( const Vector2& size, 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() @@ -1158,42 +1034,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; @@ -1210,27 +1086,29 @@ 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; + event.type = ModifyEvent::DELETE_TEXT; mImpl->mModifyEvents.push_back( event ); } else if( !keyString.empty() ) { // Queue an insert event ModifyEvent event; - event.type = INSERT_TEXT; + event.type = ModifyEvent::INSERT_TEXT; event.text = keyString; mImpl->mModifyEvents.push_back( event ); } - RequestRelayout(); + mImpl->ChangeState( EventData::EDITING ); // todo Confirm this is the best place to change the state of + + mImpl->RequestRelayout(); } return false; @@ -1238,33 +1116,50 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) 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( mImpl->mTextInput ) + 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 ); + + mImpl->RequestRelayout(); + } +} + +void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); + + if( mImpl->mEventData ) + { + Event event( Event::PAN_EVENT ); + event.p1.mInt = state; + event.p2.mFloat = displacement.x; + event.p3.mFloat = displacement.y; + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } void Controller::GrabHandleEvent( GrabHandleState state, float x, float y ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected GrabHandleEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::GRAB_HANDLE_EVENT ); + Event event( Event::GRAB_HANDLE_EVENT ); event.p1.mUint = state; event.p2.mFloat = x; event.p3.mFloat = y; - mImpl->mTextInput->mEventQueue.push_back( event ); + + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } }