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=1a39d1694385e09db68f04ad7ad5d7675a602b6c;hp=24521a5fcb55c2becc4a7bb5c5792e9e076c7be0;hb=ebbf2aed6e030f66f640d0f4c933e76e9b63ee27;hpb=93239b0a0c53c6475cc8398b091eb9f80a9c64e1 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 24521a5..1a39d16 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -41,8 +42,23 @@ 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; +}; + } // namespace namespace Dali @@ -61,8 +77,9 @@ struct Controller::TextInput { KEYBOARD_FOCUS_GAIN_EVENT, KEYBOARD_FOCUS_LOST_EVENT, - KEY_EVENT, + CURSOR_KEY_EVENT, TAP_EVENT, + PAN_EVENT, GRAB_HANDLE_EVENT }; @@ -71,7 +88,6 @@ struct Controller::TextInput int mInt; unsigned int mUint; float mFloat; - char* mString; }; struct Event @@ -93,7 +109,8 @@ struct Controller::TextInput { INACTIVE, SELECTING, - EDITING + EDITING, + EDITING_WITH_POPUP }; TextInput( LogicalModelPtr logicalModel, @@ -103,15 +120,24 @@ struct Controller::TextInput mVisualModel( visualModel ), mDecorator( decorator ), mState( INACTIVE ), + mPrimaryCursorPosition( 0u ), + mSecondaryCursorPosition( 0u ), mDecoratorUpdated( false ), - mCursorBlinkEnabled( true ) + mCursorBlinkEnabled( true ), + mGrabHandleEnabled( true ), + mGrabHandlePopupEnabled( true ), + mSelectionEnabled( true ), + mHorizontalScrollingEnabled( true ), + mVerticalScrollingEnabled( false ), + mUpdateCursorPosition( false ) { } /** * @brief Helper to move the cursor, grab handle etc. */ - bool ProcessInputEvents() + bool ProcessInputEvents( const Vector2& controlSize, + const Vector2& alignmentOffset ) { mDecoratorUpdated = false; @@ -131,14 +157,19 @@ struct Controller::TextInput OnKeyboardFocus( false ); break; } - case KEY_EVENT: + case CURSOR_KEY_EVENT: { - OnKeyEvent( *iter ); + OnCursorKeyEvent( *iter ); break; } case TAP_EVENT: { - OnTapEvent( *iter ); + OnTapEvent( *iter, alignmentOffset ); + break; + } + case PAN_EVENT: + { + OnPanEvent( *iter, controlSize, alignmentOffset ); break; } case GRAB_HANDLE_EVENT: @@ -150,6 +181,13 @@ struct Controller::TextInput } } + // The cursor must also be repositioned after inserts into the model + if( mUpdateCursorPosition ) + { + UpdateCursorPosition(); + mUpdateCursorPosition = false; + } + mEventQueue.clear(); return mDecoratorUpdated; @@ -167,57 +205,35 @@ struct Controller::TextInput } } - void OnKeyEvent( const Event& event ) + void OnCursorKeyEvent( const Event& event ) { int keyCode = event.p1.mInt; - // Handle state changes - if( Dali::DALI_KEY_ESCAPE == keyCode ) + if( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) { - ChangeState( INACTIVE ); // Escape key ends edit mode + // TODO } - else if ( event.p2.mString ) + else if( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) { - // Some text may be selected, hiding keyboard causes an empty keystring to be sent, we don't want to delete highlight in this case - ChangeState( EDITING ); + // TODO } - - // Handle the actual key event - if( Dali::DALI_KEY_BACKSPACE == keyCode ) + else if( Dali::DALI_KEY_CURSOR_UP == keyCode ) { - HandleBackspaceKey(); + // TODO } - else if( Dali::DALI_KEY_CURSOR_LEFT == keyCode || - Dali::DALI_KEY_CURSOR_RIGHT == keyCode || - Dali::DALI_KEY_CURSOR_UP == keyCode || - Dali::DALI_KEY_CURSOR_DOWN == keyCode ) + else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) { - HandleCursorKey( keyCode ); - } - else if ( event.p2.mString ) - { - HandleKeyString( event.p2.mString ); - - delete [] event.p2.mString; + // TODO } } - void HandleBackspaceKey() - { - // TODO - } - void HandleCursorKey( int keyCode ) { // TODO } - void HandleKeyString( const char* keyString ) - { - // TODO - } - - void OnTapEvent( const Event& event ) + void OnTapEvent( const Event& event, + const Vector2& alignmentOffset ) { unsigned int tapCount = event.p1.mUint; @@ -225,17 +241,75 @@ struct Controller::TextInput { ChangeState( EDITING ); - float xPosition = event.p2.mFloat; - float yPosition = event.p3.mFloat; + float xPosition = event.p2.mFloat - alignmentOffset.x; + float yPosition = event.p3.mFloat - alignmentOffset.y; 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 ); + + RepositionSelectionHandles( event.p2.mFloat, event.p3.mFloat ); + } + } + + void OnPanEvent( const Event& event, + const Vector2& controlSize, + const Vector2& alignmentOffset ) + { + int state = event.p1.mInt; + + if( Gesture::Started == state || + Gesture::Continuing == state ) + { + const Vector2& actualSize = mVisualModel->GetActualSize(); + + if( mHorizontalScrollingEnabled ) + { + const float displacementX = event.p2.mFloat; + mScrollPosition.x += displacementX; + + // Clamp between -space & 0 (and the text alignment). + const float contentWidth = actualSize.width; + if( contentWidth > controlSize.width ) + { + const float space = ( contentWidth - controlSize.width ) + alignmentOffset.x; + mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x; + mScrollPosition.x = ( mScrollPosition.x > -alignmentOffset.x ) ? -alignmentOffset.x : mScrollPosition.x; + + mDecoratorUpdated = true; + } + else + { + mScrollPosition.x = 0.f; + } + } + + if( mVerticalScrollingEnabled ) + { + const float displacementY = event.p3.mFloat; + mScrollPosition.y += displacementY; + + // Clamp between -space & 0 (and the text alignment). + if( actualSize.height > controlSize.height ) + { + const float space = ( actualSize.height - controlSize.height ) + alignmentOffset.y; + mScrollPosition.y = ( mScrollPosition.y < -space ) ? -space : mScrollPosition.y; + mScrollPosition.y = ( mScrollPosition.y > -alignmentOffset.y ) ? -alignmentOffset.y : mScrollPosition.y; + + mDecoratorUpdated = true; + } + else + { + mScrollPosition.y = 0.f; + } + } } } @@ -249,17 +323,50 @@ 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(); + //mDecorator->HidePopup(); + ChangeState ( EDITING ); mDecoratorUpdated = true; } - else if ( GRAB_HANDLE_RELEASED == state ) + else if ( mGrabHandlePopupEnabled && + GRAB_HANDLE_RELEASED == state ) { - mDecorator->ShowPopup(); + //mDecorator->ShowPopup(); + ChangeState ( EDITING_WITH_POPUP ); + mDecoratorUpdated = true; } + } + + void RepositionSelectionHandles( float visualX, float visualY ) + { + // TODO - Find which word was selected + + const Vector& glyphs = mVisualModel->mGlyphs; + const Vector::SizeType glyphCount = glyphs.Count(); + + const Vector& positions = mVisualModel->mGlyphPositions; + const Vector::SizeType positionCount = positions.Count(); + + // Guard against glyphs which did not fit inside the layout + const Vector::SizeType count = (positionCount < glyphCount) ? positionCount : glyphCount; + + if( count ) + { + float primaryX = positions[0].x; + float secondaryX = positions[count-1].x + glyphs[count-1].width; + + // TODO - multi-line selection + const Vector& lines = mVisualModel->mLines; + float height = lines.Count() ? lines[0].lineSize.height : 0.0f; + + mDecorator->SetPosition( PRIMARY_SELECTION_HANDLE, primaryX, 0.0f, height ); + mDecorator->SetPosition( SECONDARY_SELECTION_HANDLE, secondaryX, 0.0f, height ); + mDecorator->ClearHighlights(); + mDecorator->AddHighlight( primaryX, 0.0f, secondaryX, height ); + } } void ChangeState( State newState ) @@ -274,7 +381,7 @@ struct Controller::TextInput mDecorator->StopCursorBlink(); mDecorator->SetGrabHandleActive( false ); mDecorator->SetSelectionActive( false ); - mDecorator->HidePopup(); + mDecorator->SetPopupActive( false ); mDecoratorUpdated = true; } else if ( SELECTING == mState ) @@ -292,55 +399,174 @@ struct Controller::TextInput { mDecorator->StartCursorBlink(); } - mDecorator->SetGrabHandleActive( true ); + if( mGrabHandleEnabled ) + { + mDecorator->SetGrabHandleActive( true ); + } + if( mGrabHandlePopupEnabled ) + { + mDecorator->SetPopupActive( false ); + } + mDecorator->SetSelectionActive( false ); + mDecoratorUpdated = true; + } + else if( EDITING_WITH_POPUP == mState ) + { + mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY ); + if( mCursorBlinkEnabled ) + { + mDecorator->StartCursorBlink(); + } + if( mGrabHandleEnabled ) + { + mDecorator->SetGrabHandleActive( true ); + } + if( mGrabHandlePopupEnabled ) + { + mDecorator->SetPopupActive( 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 ); - Text::Length numberOfGlyphs = mVisualModel->GetNumberOfGlyphs(); - if( 0 == numberOfGlyphs ) + const Vector& lines = mVisualModel->mLines; + for( float totalHeight = 0; lineIndex < lines.Count(); ++lineIndex ) + { + totalHeight += lines[lineIndex].lineSize.height; + if( y < totalHeight ) + { + return lineIndex; + } + } + + return lineIndex-1; + } + + 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 ); + } + } + + // 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; + } + + 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 - // TODO - Consider RTL languages - x = positions[closestGlyph].x + glyphs[closestGlyph].width; - y = 0.0f; + float visualX( 0.0f ); + float visualY( 0.0f ); + float height( 0.0f ); + const Vector& lineRuns = mVisualModel->mLines; - FontMetrics metrics; - TextAbstraction::FontClient::Get().GetFontMetrics( glyphs[closestGlyph].fontId, metrics ); - height = metrics.height; // TODO - Fix for multi-line + if( cursorGlyph > 0 ) + { + --cursorGlyph; + + visualX = mVisualModel->mGlyphPositions[ cursorGlyph ].x; + //if( LTR ) TODO + visualX += mVisualModel->mGlyphs[ cursorGlyph ].width; + + // Find the line height + GlyphIndex lastGlyph( 0 ); + for( LineIndex lineIndex = 0u; lineIndex < lineRuns.Count(); ++lineIndex ) + { + lastGlyph = (lineRuns[lineIndex].glyphIndex + lineRuns[lineIndex].numberOfGlyphs); + if( cursorGlyph < lastGlyph ) + { + height = lineRuns[lineIndex].lineSize.height; + break; + } + } + } + + mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, height ); + mDecoratorUpdated = true; } LogicalModelPtr mLogicalModel; @@ -355,10 +581,25 @@ struct Controller::TextInput */ vector mEventQueue; ///< The queue of touch events etc. - State mState; + 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; - bool mCursorBlinkEnabled : 1; + /** + * 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 @@ -397,8 +638,9 @@ struct Controller::Impl mFontClient(), mView(), mLayoutEngine(), - mNewText(), + mModifyEvents(), mControlSize(), + mAlignmentOffset(), mOperationsPending( NO_OPERATION ), mRecalculateNaturalSize( true ) { @@ -423,8 +665,9 @@ struct Controller::Impl TextAbstraction::FontClient mFontClient; ///< Handle to the font client. View mView; ///< The view interface to the rendering back-end. LayoutEngine mLayoutEngine; ///< The layout engine. - std::string mNewText; ///< Temporary stores the text set until the next relayout. + std::vector mModifyEvents; ///< Temporary stores the text set until the next relayout. Size mControlSize; ///< The size of the control. + Vector2 mAlignmentOffset; ///< Vertical and horizontal offset of the whole text inside the control due to alignment. OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text. bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated. }; @@ -436,26 +679,14 @@ ControllerPtr Controller::New( ControlInterface& controlInterface ) void Controller::SetText( const std::string& text ) { - // Keep until size negotiation - mImpl->mNewText = text; + // Cancel previously queued inserts etc. + mImpl->mModifyEvents.clear(); - // All operations need to be done. (convert to utf32, get break info, ..., layout, ...) - mImpl->mOperationsPending = ALL_OPERATIONS; - - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; - - // Reset buffers. - mImpl->mLogicalModel->SetText( NULL, 0u ); - mImpl->mLogicalModel->SetScripts( NULL, 0u ); - mImpl->mLogicalModel->SetFonts( NULL, 0u ); - mImpl->mLogicalModel->SetLineBreakInfo( NULL, 0u ); - mImpl->mLogicalModel->SetWordBreakInfo( NULL, 0u ); - mImpl->mLogicalModel->SetBidirectionalInfo( NULL, 0u ); - mImpl->mLogicalModel->SetVisualToLogicalMap( NULL, 0u ); - mImpl->mVisualModel->SetGlyphs( NULL, NULL, NULL, 0u ); - mImpl->mVisualModel->SetGlyphPositions( NULL, 0u ); - mImpl->mVisualModel->SetLines( NULL, 0u ); + // Keep until size negotiation + ModifyEvent event; + event.type = REPLACE_TEXT; + event.text = text; + mImpl->mModifyEvents.push_back( event ); if( mImpl->mTextInput ) { @@ -468,9 +699,10 @@ void Controller::SetText( const std::string& text ) void Controller::GetText( std::string& text ) const { - if( !mImpl->mNewText.empty() ) + if( !mImpl->mModifyEvents.empty() && + REPLACE_TEXT == mImpl->mModifyEvents[0].type ) { - text = mImpl->mNewText; + text = mImpl->mModifyEvents[0].text; } else { @@ -505,6 +737,18 @@ void Controller::SetDefaultFontFamily( const std::string& 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(); + + RequestRelayout(); } const std::string& Controller::GetDefaultFontFamily() const @@ -528,6 +772,18 @@ void Controller::SetDefaultFontStyle( const std::string& 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(); + + RequestRelayout(); } const std::string& Controller::GetDefaultFontStyle() const @@ -551,6 +807,18 @@ void Controller::SetDefaultPointSize( float 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(); + + RequestRelayout(); } float Controller::GetDefaultPointSize() const @@ -611,10 +879,28 @@ bool Controller::GetEnableCursorBlink() const return false; } +const Vector2& Controller::GetScrollPosition() const +{ + if( mImpl->mTextInput ) + { + return mImpl->mTextInput->mScrollPosition; + } + + return Vector2::ZERO; +} + +const Vector2& Controller::GetAlignmentOffset() const +{ + return mImpl->mAlignmentOffset; +} + Vector3 Controller::GetNaturalSize() { Vector3 naturalSize; + // Make sure the model is up-to-date before layouting + ProcessModifyEvents(); + if( mImpl->mRecalculateNaturalSize ) { // Operations that can be done only once until the text changes. @@ -623,13 +909,15 @@ 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 - ReplaceText( onlyOnceOperations ); + UpdateModel( onlyOnceOperations ); // Operations that need to be done if the size changes. const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | REORDER ); DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), @@ -659,6 +947,9 @@ Vector3 Controller::GetNaturalSize() float Controller::GetHeightForWidth( float width ) { + // Make sure the model is up-to-date before layouting + ProcessModifyEvents(); + Size layoutSize; if( width != mImpl->mControlSize.width ) { @@ -668,14 +959,15 @@ 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 - ReplaceText( onlyOnceOperations ); + UpdateModel( onlyOnceOperations ); // Operations that need to be done if the size changes. const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | REORDER ); DoRelayout( Size( width, MAX_FLOAT ), @@ -697,7 +989,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 ) ) { @@ -717,6 +1009,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 ); @@ -724,7 +1017,8 @@ bool Controller::Relayout( const Vector2& size ) } // Make sure the model is up-to-date before layouting - ReplaceText( mImpl->mOperationsPending ); + ProcessModifyEvents(); + UpdateModel( mImpl->mOperationsPending ); Size layoutSize; bool updated = DoRelayout( mImpl->mControlSize, @@ -734,40 +1028,219 @@ bool Controller::Relayout( const Vector2& size ) // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; + // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated. + CalculateTextAlignment( size ); + if( mImpl->mTextInput ) { // Move the cursor, grab handle etc. - updated = mImpl->mTextInput->ProcessInputEvents() || updated; + updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize, mImpl->mAlignmentOffset ) || updated; } return updated; } -void Controller::ReplaceText( OperationsMask operationsRequired ) +void Controller::ProcessModifyEvents() { - // Calculate the operations to be done. - const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); + std::vector& events = mImpl->mModifyEvents; + 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(); + + // Convert text into UTF-32 Vector& utf32Characters = mImpl->mLogicalModel->mText; - if( CONVERT_TO_UTF32 & operations ) + 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 the cursor position + if( mImpl->mTextInput ) { - std::string& text = mImpl->mNewText; + mImpl->mTextInput->mPrimaryCursorPosition = characterCount; + // TODO - handle secondary cursor + } + + // 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 ); +} - // Convert text into UTF-32 - utf32Characters.Resize( text.size() ); +void Controller::InsertTextEvent( const std::string& text ) +{ + 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->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(); + + // 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 ); + + // Insert at current cursor position + Vector& modifyText = mImpl->mLogicalModel->mText; + CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + + if( cursorIndex < modifyText.Count() ) + { + modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.End() ); + } + else + { + modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.End() ); + } - // This is a bit horrible but std::string returns a (signed) char* - const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + // Advance the cursor position + ++cursorIndex; - // Transform a text array encoded in utf8 into an array encoded in utf32. - // It returns the actual number of characters. - const Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); - utf32Characters.Resize( characterCount ); + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; - // Discard temporary text - text.clear(); + // Apply modifications to the model; TODO - Optimize this + mImpl->mOperationsPending = ALL_OPERATIONS; + 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::DeleteTextEvent() +{ + 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->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(); + + // 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; } + // 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->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; @@ -830,6 +1303,8 @@ void Controller::ReplaceText( 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 @@ -854,15 +1329,37 @@ void Controller::ReplaceText( 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, @@ -886,7 +1383,7 @@ void Controller::ReplaceText( OperationsMask operationsRequired ) } } -bool Controller::DoRelayout( const Vector2& size, +bool Controller::DoRelayout( const Size& size, OperationsMask operationsRequired, Size& layoutSize ) { @@ -901,7 +1398,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; @@ -912,6 +1408,7 @@ bool Controller::DoRelayout( const Vector2& size, // Set the layout parameters. LayoutParameters layoutParameters( size, + mImpl->mLogicalModel->mText.Begin(), lineBreakInfo.Begin(), wordBreakInfo.Begin(), numberOfGlyphs, @@ -925,18 +1422,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, @@ -993,6 +1488,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. @@ -1000,7 +1503,7 @@ bool Controller::DoRelayout( const Vector2& size, { mImpl->mVisualModel->SetActualSize( layoutSize ); } - } + } // view updated } else { @@ -1010,6 +1513,53 @@ bool Controller::DoRelayout( const Vector2& size, return viewUpdated; } +void Controller::CalculateTextAlignment( const Size& size ) +{ + // TODO : Calculate the vertical offset. + + // 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::Alignment alignment = mImpl->mLayoutEngine.GetAlignment(); + if( firstParagraphDirection && + ( LayoutEngine::ALIGN_CENTER != alignment ) ) + { + if( LayoutEngine::ALIGN_BEGIN == alignment ) + { + alignment = LayoutEngine::ALIGN_END; + } + else + { + alignment = LayoutEngine::ALIGN_BEGIN; + } + } + + switch( alignment ) + { + case LayoutEngine::ALIGN_BEGIN: + { + mImpl->mAlignmentOffset = Vector2::ZERO; + break; + } + case LayoutEngine::ALIGN_CENTER: + { + mImpl->mAlignmentOffset.y = 0.f; + 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::ALIGN_END: + { + mImpl->mAlignmentOffset.y = 0.f; + mImpl->mAlignmentOffset.x = size.width - actualSize.width; + break; + } + } +} + View& Controller::GetView() { return mImpl->mView; @@ -1055,21 +1605,44 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mTextInput && + keyEvent.state == KeyEvent::Down ) { - TextInput::Event event( TextInput::KEY_EVENT ); - event.p1.mInt = keyEvent.keyCode; - event.p2.mString = NULL; - + int keyCode = keyEvent.keyCode; const std::string& keyString = keyEvent.keyPressed; - if ( !keyString.empty() ) + + // Pre-process to separate modifying events from non-modifying input events. + if( Dali::DALI_KEY_ESCAPE == keyCode ) + { + // Escape key is a special case which causes focus loss + KeyboardFocusLostEvent(); + } + else if( Dali::DALI_KEY_CURSOR_LEFT == keyCode || + Dali::DALI_KEY_CURSOR_RIGHT == keyCode || + Dali::DALI_KEY_CURSOR_UP == keyCode || + Dali::DALI_KEY_CURSOR_DOWN == keyCode ) { - event.p2.mString = new char[keyString.size() + 1]; - std::copy(keyString.begin(), keyString.end(), event.p2.mString); - event.p2.mString[keyString.size()] = '\0'; + TextInput::Event event( TextInput::CURSOR_KEY_EVENT ); + event.p1.mInt = keyCode; + mImpl->mTextInput->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 ); + } + else if( !keyString.empty() ) + { + // Queue an insert event + ModifyEvent event; + event.type = INSERT_TEXT; + event.text = keyString; + mImpl->mModifyEvents.push_back( event ); } - mImpl->mTextInput->mEventQueue.push_back( event ); + mImpl->mTextInput->ChangeState( TextInput::EDITING ); // todo Confirm this is the best place to change the state of RequestRelayout(); } @@ -1093,6 +1666,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" );