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=47b0115f3e3190af02cfc4e3407611993031aeba;hp=b4d4bb56013aae1c2cf5cf0cd10f7b88ff3f652b;hb=5a984a1705bf94f17a8ef6a05ce170d1a47e49b1;hpb=d4324d0aaec66dd8104801c51ec87bbcdd356e6c diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index b4d4bb5..47b0115 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -79,6 +79,7 @@ struct Controller::TextInput KEYBOARD_FOCUS_LOST_EVENT, CURSOR_KEY_EVENT, TAP_EVENT, + PAN_EVENT, GRAB_HANDLE_EVENT }; @@ -121,14 +122,20 @@ struct Controller::TextInput mPrimaryCursorPosition( 0u ), mSecondaryCursorPosition( 0u ), mDecoratorUpdated( false ), - mCursorBlinkEnabled( true ) + mCursorBlinkEnabled( true ), + mGrabHandleEnabled( false ), + mGrabHandlePopupEnabled( false ), + mSelectionEnabled( false ), + mHorizontalScrollingEnabled( true ), + mVerticalScrollingEnabled( false ), + mUpdateCursorPosition( false ) { } /** * @brief Helper to move the cursor, grab handle etc. */ - bool ProcessInputEvents() + bool ProcessInputEvents( const Vector2& controlSize ) { mDecoratorUpdated = false; @@ -158,6 +165,11 @@ struct Controller::TextInput OnTapEvent( *iter ); break; } + case PAN_EVENT: + { + OnPanEvent( *iter, controlSize ); + break; + } case GRAB_HANDLE_EVENT: { OnGrabHandleEvent( *iter ); @@ -167,6 +179,13 @@ struct Controller::TextInput } } + // The cursor must also be repositioned after inserts into the model + if( mUpdateCursorPosition ) + { + UpdateCursorPosition(); + mUpdateCursorPosition = false; + } + mEventQueue.clear(); return mDecoratorUpdated; @@ -206,21 +225,11 @@ struct Controller::TextInput } } - 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; @@ -232,17 +241,56 @@ struct Controller::TextInput float xPosition = event.p2.mFloat; float yPosition = event.p3.mFloat; float height(0.0f); - GetClosestCursorPosition( xPosition, yPosition, height ); + GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); + mUpdateCursorPosition = false; mDecoratorUpdated = true; } - else if( 2u == tapCount ) + else if( mSelectionEnabled && + 2u == tapCount ) { ChangeState( SELECTING ); } } + 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; + } + } + } + void OnGrabHandleEvent( const Event& event ) { unsigned int state = event.p1.mUint; @@ -253,17 +301,17 @@ struct Controller::TextInput float yPosition = event.p3.mFloat; float height(0.0f); - GetClosestCursorPosition( xPosition, yPosition, height ); + GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); mDecorator->HidePopup(); mDecoratorUpdated = true; } - else if ( GRAB_HANDLE_RELEASED == state ) + else if ( mGrabHandlePopupEnabled && + GRAB_HANDLE_RELEASED == state ) { mDecorator->ShowPopup(); } - } void ChangeState( State newState ) @@ -296,55 +344,150 @@ struct Controller::TextInput { mDecorator->StartCursorBlink(); } - mDecorator->SetGrabHandleActive( true ); + if( mGrabHandleEnabled ) + { + mDecorator->SetGrabHandleActive( true ); + } mDecorator->SetSelectionActive( false ); mDecoratorUpdated = true; } } } - void GetClosestCursorPosition( float& x, float& y, float& height ) + LineIndex GetClosestLine( float y ) { - // TODO - Look at LineRuns first + 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; + } + } - Text::Length numberOfGlyphs = mVisualModel->GetNumberOfGlyphs(); - if( 0 == numberOfGlyphs ) + return lineIndex; + } + + 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; } - Vector& glyphs = mVisualModel->mGlyphs; + // 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(); - Vector& positions = mVisualModel->mGlyphPositions; + 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; - for( unsigned int i = 0, numberOfGLyphs = glyphs.Count(); i < numberOfGLyphs; ++i ) + 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 - x ) + fabsf( glyphY - y ); + float distanceToGlyph = fabsf( glyphX - visualX ) + fabsf( glyphY - visualY ); if( distanceToGlyph < closestDistance ) { closestDistance = distanceToGlyph; closestGlyph = i; + leftOfGlyph = ( visualX < glyphX ); } } - // TODO - Consider RTL languages - x = positions[closestGlyph].x + glyphs[closestGlyph].width; - y = 0.0f; + // Calculate the logical position + logical = mVisualModel->GetCharacterIndex( closestGlyph ); - FontMetrics metrics; - TextAbstraction::FontClient::Get().GetFontMetrics( glyphs[closestGlyph].fontId, metrics ); - height = metrics.height; // TODO - Fix for multi-line + // 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; + } + + void UpdateCursorPosition() + { + 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( mPrimaryCursorPosition == mVisualModel->GetCharacterIndex( cursorGlyph ) ) + { + break; + } + } +#endif + + float visualX( 0.0f ); + float visualY( 0.0f ); + LineIndex lineIndex( 0u ); + const Vector& lineRuns = mVisualModel->mLines; + + if( cursorGlyph > 0 ) + { + --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; + } + } + } + + mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, lineRuns[lineIndex].lineSize.height ); + mDecoratorUpdated = true; } LogicalModelPtr mLogicalModel; @@ -364,8 +507,20 @@ struct Controller::TextInput 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 + /** + * 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 @@ -607,6 +762,16 @@ bool Controller::GetEnableCursorBlink() const return false; } +const Vector2& Controller::GetScrollPosition() const +{ + if( mImpl->mTextInput ) + { + return mImpl->mTextInput->mScrollPosition; + } + + return Vector2::ZERO; +} + Vector3 Controller::GetNaturalSize() { Vector3 naturalSize; @@ -622,6 +787,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 +795,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 +837,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 +845,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 ), @@ -718,6 +887,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 ); @@ -739,7 +909,7 @@ bool Controller::Relayout( const Vector2& size ) if( mImpl->mTextInput ) { // Move the cursor, grab handle etc. - updated = mImpl->mTextInput->ProcessInputEvents() || updated; + updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize ) || updated; } return updated; @@ -775,12 +945,22 @@ void Controller::ProcessModifyEvents() void Controller::ReplaceTextEvent( const std::string& text ) { // 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; @@ -807,7 +987,8 @@ 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 ); } @@ -822,7 +1003,16 @@ void Controller::InsertTextEvent( const std::string& text ) 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; @@ -858,9 +1048,13 @@ 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->mTextInput->mUpdateCursorPosition = true; } void Controller::DeleteTextEvent() @@ -873,7 +1067,16 @@ void Controller::DeleteTextEvent() 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; @@ -894,9 +1097,13 @@ 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->mTextInput->mUpdateCursorPosition = true; } void Controller::UpdateModel( OperationsMask operationsRequired ) @@ -968,6 +1175,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,6 +1201,14 @@ 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 ); + } } Vector& glyphs = mImpl->mVisualModel->mGlyphs; @@ -999,8 +1216,9 @@ void Controller::UpdateModel( OperationsMask operationsRequired ) 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, @@ -1039,7 +1257,6 @@ 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(); Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; @@ -1050,6 +1267,7 @@ bool Controller::DoRelayout( const Vector2& size, // Set the layout parameters. LayoutParameters layoutParameters( size, + mImpl->mLogicalModel->mText.Begin(), lineBreakInfo.Begin(), wordBreakInfo.Begin(), numberOfGlyphs, @@ -1063,18 +1281,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 +1347,13 @@ bool Controller::DoRelayout( const Vector2& size, free( bidiLineInfo.visualToLogicalMap ); } } + } // REORDER + + if( ALIGN & operations ) + { + mImpl->mLayoutEngine.Align( layoutParameters, + lines, + glyphPositions ); } // Sets the actual size. @@ -1138,7 +1361,7 @@ bool Controller::DoRelayout( const Vector2& size, { mImpl->mVisualModel->SetActualSize( layoutSize ); } - } + } // view updated } else { @@ -1252,6 +1475,22 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) } } +void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) +{ + DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected PanEvent" ); + + if( mImpl->mTextInput ) + { + TextInput::Event event( TextInput::PAN_EVENT ); + event.p1.mInt = state; + event.p2.mFloat = displacement.x; + event.p3.mFloat = displacement.y; + mImpl->mTextInput->mEventQueue.push_back( event ); + + RequestRelayout(); + } +} + void Controller::GrabHandleEvent( GrabHandleState state, float x, float y ) { DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" );