#include <dali-toolkit/internal/text/character-set-conversion.h>
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/logical-model.h>
+#include <dali-toolkit/internal/text/logical-model-impl.h>
#include <dali-toolkit/internal/text/multi-language-support.h>
#include <dali-toolkit/internal/text/script-run.h>
#include <dali-toolkit/internal/text/segmentation.h>
#include <dali-toolkit/internal/text/shaper.h>
+#include <dali-toolkit/internal/text/text-io.h>
#include <dali-toolkit/internal/text/text-view.h>
-#include <dali-toolkit/internal/text/visual-model.h>
+#include <dali-toolkit/internal/text/visual-model-impl.h>
using std::vector;
namespace
{
+
const float MAX_FLOAT = std::numeric_limits<float>::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
{
KEYBOARD_FOCUS_GAIN_EVENT,
KEYBOARD_FOCUS_LOST_EVENT,
- KEY_EVENT,
+ CURSOR_KEY_EVENT,
TAP_EVENT,
GRAB_HANDLE_EVENT
};
int mInt;
unsigned int mUint;
float mFloat;
- char* mString;
};
struct Event
mVisualModel( visualModel ),
mDecorator( decorator ),
mState( INACTIVE ),
+ mPrimaryCursorPosition( 0u ),
+ mSecondaryCursorPosition( 0u ),
mDecoratorUpdated( false ),
mCursorBlinkEnabled( true )
{
OnKeyboardFocus( false );
break;
}
- case KEY_EVENT:
+ case CURSOR_KEY_EVENT:
{
- OnKeyEvent( *iter );
+ OnCursorKeyEvent( *iter );
break;
}
case TAP_EVENT:
}
}
- 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 )
- {
- HandleCursorKey( keyCode );
- }
- else if ( event.p2.mString )
+ else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode )
{
- HandleKeyString( event.p2.mString );
-
- delete [] event.p2.mString;
+ // TODO
}
}
return;
}
- Vector<GlyphInfo> glyphs;
- glyphs.Resize( numberOfGlyphs );
- mVisualModel->GetGlyphs( glyphs.Begin(), 0, numberOfGlyphs );
+ Vector<GlyphInfo>& glyphs = mVisualModel->mGlyphs;
const GlyphInfo* const glyphsBuffer = glyphs.Begin();
- Vector<Vector2> positions;
- positions.Resize( numberOfGlyphs );
- mVisualModel->GetGlyphPositions( positions.Begin(), 0, numberOfGlyphs );
+ Vector<Vector2>& positions = mVisualModel->mGlyphPositions;
const Vector2* const positionsBuffer = positions.Begin();
unsigned int closestGlyph = 0;
*/
vector<Event> 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;
+ 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
mFontClient(),
mView(),
mLayoutEngine(),
- mNewText(),
+ mModifyEvents(),
mControlSize(),
mOperationsPending( NO_OPERATION ),
mRecalculateNaturalSize( true )
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<ModifyEvent> 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.
void Controller::SetText( const std::string& text )
{
- // Keep until size negotiation
- mImpl->mNewText = text;
-
- // 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;
+ // Cancel previously queued inserts etc.
+ mImpl->mModifyEvents.clear();
- // 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 )
{
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
{
return false;
}
+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.
+ const OperationsMask onlyOnceOperations = static_cast<OperationsMask>( CONVERT_TO_UTF32 |
+ GET_SCRIPTS |
+ VALIDATE_FONTS |
+ GET_LINE_BREAKS |
+ GET_WORD_BREAKS |
+ BIDI_INFO |
+ SHAPE_TEXT |
+ GET_GLYPH_METRICS );
+ // Make sure the model is up-to-date before layouting
+ UpdateModel( onlyOnceOperations );
+
+ // Operations that need to be done if the size changes.
+ const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
+ REORDER );
+
+ DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ),
+ static_cast<OperationsMask>( onlyOnceOperations |
+ sizeOperations ),
+ naturalSize.GetVectorXY() );
+
+ // Do not do again the only once operations.
+ mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending & ~onlyOnceOperations );
+
+ // Do the size related operations again.
+ mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending | sizeOperations );
+
+ // Stores the natural size to avoid recalculate it again
+ // unless the text/style changes.
+ mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() );
+
+ mImpl->mRecalculateNaturalSize = false;
+ }
+ else
+ {
+ naturalSize = mImpl->mVisualModel->GetNaturalSize();
+ }
+
+ return naturalSize;
+}
+
+float Controller::GetHeightForWidth( float width )
+{
+ // Make sure the model is up-to-date before layouting
+ ProcessModifyEvents();
+
+ Size layoutSize;
+ if( width != mImpl->mControlSize.width )
+ {
+ // Operations that can be done only once until the text changes.
+ const OperationsMask onlyOnceOperations = static_cast<OperationsMask>( CONVERT_TO_UTF32 |
+ GET_SCRIPTS |
+ VALIDATE_FONTS |
+ GET_LINE_BREAKS |
+ GET_WORD_BREAKS |
+ BIDI_INFO |
+ SHAPE_TEXT |
+ GET_GLYPH_METRICS );
+ // Make sure the model is up-to-date before layouting
+ UpdateModel( onlyOnceOperations );
+
+ // Operations that need to be done if the size changes.
+ const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
+ REORDER );
+
+ DoRelayout( Size( width, MAX_FLOAT ),
+ static_cast<OperationsMask>( onlyOnceOperations |
+ sizeOperations ),
+ layoutSize );
+
+ // Do not do again the only once operations.
+ mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending & ~onlyOnceOperations );
+
+ // Do the size related operations again.
+ mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending | sizeOperations );
+ }
+ else
+ {
+ layoutSize = mImpl->mVisualModel->GetActualSize();
+ }
+
+ return layoutSize.height;
+}
+
bool Controller::Relayout( const Vector2& size )
{
if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending |
LAYOUT |
UPDATE_ACTUAL_SIZE |
- UPDATE_POSITIONS |
- UPDATE_LINES |
REORDER );
mImpl->mControlSize = size;
}
+ // Make sure the model is up-to-date before layouting
+ ProcessModifyEvents();
+ UpdateModel( mImpl->mOperationsPending );
+
Size layoutSize;
bool updated = DoRelayout( mImpl->mControlSize,
mImpl->mOperationsPending,
return updated;
}
-bool Controller::DoRelayout( const Vector2& size,
- OperationsMask operationsRequired,
- Size& layoutSize )
+void Controller::ProcessModifyEvents()
{
- bool viewUpdated( false );
+ std::vector<ModifyEvent>& events = mImpl->mModifyEvents;
- // Calculate the operations to be done.
- const OperationsMask operations = static_cast<OperationsMask>( mImpl->mOperationsPending & operationsRequired );
+ for( unsigned int i=0; i<events.size(); ++i )
+ {
+ if( REPLACE_TEXT == events[0].type )
+ {
+ // A (single) replace event should come first, otherwise we wasted time processing NOOP events
+ DALI_ASSERT_DEBUG( 0 == i && "Unexpected REPLACE event" );
+
+ ReplaceTextEvent( events[0].text );
+ }
+ else if( INSERT_TEXT == events[0].type )
+ {
+ InsertTextEvent( events[0].text );
+ }
+ else if( DELETE_TEXT == events[0].type )
+ {
+ DeleteTextEvent();
+ }
+ }
+ // Discard temporary text
+ events.clear();
+}
+
+void Controller::ReplaceTextEvent( const std::string& text )
+{
+ // Reset buffers.
+ mImpl->mLogicalModel->mScriptRuns.Clear();
+ mImpl->mLogicalModel->mFontRuns.Clear();
+ mImpl->mLogicalModel->mLineBreakInfo.Clear();
+ mImpl->mLogicalModel->mWordBreakInfo.Clear();
+ mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear();
+ mImpl->mVisualModel->mGlyphs.Clear();
+
+ // Convert text into UTF-32
+ Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
+ utf32Characters.Resize( text.size() );
+
+ // This is a bit horrible but std::string returns a (signed) char*
+ const uint8_t* utf8 = reinterpret_cast<const uint8_t*>( 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 )
+ {
+ 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<OperationsMask>( LAYOUT |
+ UPDATE_ACTUAL_SIZE |
+ REORDER );
+}
+
+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->mVisualModel->mGlyphs.Clear();
+
+ // Convert text into UTF-32
Vector<Character> utf32Characters;
- Length characterCount = 0u;
- 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<const uint8_t*>( 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<Character>& modifyText = mImpl->mLogicalModel->mText;
+ CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition;
+
+ if( cursorIndex < modifyText.Count() )
{
- std::string& text = mImpl->mNewText;
+ modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.End() );
+ }
+ else
+ {
+ modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.End() );
+ }
- // Convert text into UTF-32
- utf32Characters.Resize( text.size() );
+ // Advance the cursor position
+ ++cursorIndex;
- // This is a bit horrible but std::string returns a (signed) char*
- const uint8_t* utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
+ // The natural size needs to be re-calculated.
+ mImpl->mRecalculateNaturalSize = true;
- // Transform a text array encoded in utf8 into an array encoded in utf32.
- // It returns the actual number of characters.
- characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() );
- utf32Characters.Resize( characterCount );
+ // Apply modifications to the model; TODO - Optimize this
+ mImpl->mOperationsPending = ALL_OPERATIONS;
+ UpdateModel( ALL_OPERATIONS );
+ mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
+ UPDATE_ACTUAL_SIZE |
+ REORDER );
+}
- // Sets the text into the model.
- mImpl->mLogicalModel->SetText( utf32Characters.Begin(), characterCount );
+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->mVisualModel->mGlyphs.Clear();
+
+ // Delte at current cursor position
+ Vector<Character>& modifyText = mImpl->mLogicalModel->mText;
+ CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition;
+
+ if( cursorIndex > 0 &&
+ cursorIndex-1 < modifyText.Count() )
+ {
+ modifyText.Remove( modifyText.Begin() + cursorIndex - 1 );
- // Discard temporary text
- text.clear();
+ // 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<OperationsMask>( LAYOUT |
+ UPDATE_ACTUAL_SIZE |
+ REORDER );
+}
+
+void Controller::UpdateModel( OperationsMask operationsRequired )
+{
+ // Calculate the operations to be done.
+ const OperationsMask operations = static_cast<OperationsMask>( mImpl->mOperationsPending & operationsRequired );
+
+ Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
+
const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters();
- Vector<LineBreakInfo> lineBreakInfo;
+ Vector<LineBreakInfo>& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo;
if( GET_LINE_BREAKS & operations )
{
// Retrieves the line break info. The line break info is used to split the text in 'paragraphs' to
// calculate the bidirectional info for each 'paragraph'.
// It's also used to layout the text (where it should be a new line) or to shape the text (text in different lines
// is not shaped together).
- lineBreakInfo.Resize( characterCount, TextAbstraction::LINE_NO_BREAK );
+ lineBreakInfo.Resize( numberOfCharacters, TextAbstraction::LINE_NO_BREAK );
SetLineBreakInfo( utf32Characters,
lineBreakInfo );
-
- mImpl->mLogicalModel->SetLineBreakInfo( lineBreakInfo.Begin(), characterCount );
}
- Vector<WordBreakInfo> wordBreakInfo;
+ Vector<WordBreakInfo>& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo;
if( GET_WORD_BREAKS & operations )
{
// Retrieves the word break info. The word break info is used to layout the text (where to wrap the text in lines).
- wordBreakInfo.Resize( characterCount, TextAbstraction::WORD_NO_BREAK );
+ wordBreakInfo.Resize( numberOfCharacters, TextAbstraction::WORD_NO_BREAK );
SetWordBreakInfo( utf32Characters,
wordBreakInfo );
-
- mImpl->mLogicalModel->SetWordBreakInfo( wordBreakInfo.Begin(), characterCount );
}
const bool getScripts = GET_SCRIPTS & operations;
const bool validateFonts = VALIDATE_FONTS & operations;
- Vector<ScriptRun> scripts;
- Vector<FontRun> validFonts;
+ Vector<ScriptRun>& scripts = mImpl->mLogicalModel->mScriptRuns;
+ Vector<FontRun>& validFonts = mImpl->mLogicalModel->mFontRuns;
if( getScripts || validateFonts )
{
multilanguageSupport.SetScripts( utf32Characters,
lineBreakInfo,
scripts );
-
- // Sets the scripts into the model.
- mImpl->mLogicalModel->SetScripts( scripts.Begin(), scripts.Count() );
}
if( validateFonts )
{
- // Copy the requested font defaults received via the property system.
- // These may not be valid i.e. may not contain glyphs for the necessary scripts.
- GetDefaultFonts( validFonts, numberOfCharacters );
+ if( 0u == validFonts.Count() )
+ {
+ // Copy the requested font defaults received via the property system.
+ // These may not be valid i.e. may not contain glyphs for the necessary scripts.
+ GetDefaultFonts( validFonts, numberOfCharacters );
+ }
// Validates the fonts. If there is a character with no assigned font it sets a default one.
// After this call, fonts are validated.
multilanguageSupport.ValidateFonts( utf32Characters,
scripts,
validFonts );
-
- // Sets the fonts into the model.
- mImpl->mLogicalModel->SetFonts( validFonts.Begin(), validFonts.Count() );
}
}
- Vector<BidirectionalParagraphInfoRun> bidirectionalInfo;
+ Vector<Character> mirroredUtf32Characters;
+ bool textMirrored = false;
if( BIDI_INFO & operations )
{
- // Some vectors with data needed to get the paragraph's bidirectional info may be void
- // after the first time the text has been laid out.
- // Fill the vectors again.
-
- if( 0u == utf32Characters.Count() )
- {
- utf32Characters.Resize( numberOfCharacters );
-
- mImpl->mLogicalModel->GetText( utf32Characters.Begin(),
- 0u,
- numberOfCharacters );
- }
-
- if( 0u == lineBreakInfo.Count() )
- {
- lineBreakInfo.Resize( numberOfCharacters );
-
- mImpl->mLogicalModel->GetLineBreakInfo( lineBreakInfo.Begin(),
- 0u,
- numberOfCharacters );
- }
-
- if( 0u == scripts.Count() )
- {
- scripts.Resize( mImpl->mLogicalModel->GetNumberOfScriptRuns( 0u,
- numberOfCharacters ) );
- mImpl->mLogicalModel->GetScriptRuns( scripts.Begin(),
- 0u,
- numberOfCharacters );
- }
-
// Count the number of LINE_NO_BREAK to reserve some space for the vector of paragraph's
// bidirectional info.
Length numberOfParagraphs = 0u;
const TextAbstraction::LineBreakInfo* lineBreakInfoBuffer = lineBreakInfo.Begin();
- for( Length index = 0u; index < characterCount; ++index )
+ for( Length index = 0u; index < numberOfCharacters; ++index )
{
if( TextAbstraction::LINE_NO_BREAK == *( lineBreakInfoBuffer + index ) )
{
}
}
+ Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo;
bidirectionalInfo.Reserve( numberOfParagraphs );
// Calculates the bidirectional info for the whole paragraph if it contains right to left scripts.
lineBreakInfo,
bidirectionalInfo );
- mImpl->mLogicalModel->SetBidirectionalInfo( bidirectionalInfo.Begin(),
- bidirectionalInfo.Count() );
+ 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<GlyphInfo> glyphs;
- Vector<CharacterIndex> glyphsToCharactersMap;
- Vector<Length> charactersPerGlyph;
+ Vector<GlyphInfo>& glyphs = mImpl->mVisualModel->mGlyphs;
+ Vector<CharacterIndex>& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters;
+ Vector<Length>& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph;
if( SHAPE_TEXT & operations )
{
- if( 0u == validFonts.Count() )
- {
- validFonts.Resize( mImpl->mLogicalModel->GetNumberOfFontRuns( 0u,
- numberOfCharacters ) );
- mImpl->mLogicalModel->GetFontRuns( validFonts.Begin(),
- 0u,
- numberOfCharacters );
- }
-
+ const Vector<Character>& textToShape = textMirrored ? mirroredUtf32Characters : utf32Characters;
// Shapes the text.
- ShapeText( utf32Characters,
+ ShapeText( textToShape,
lineBreakInfo,
scripts,
validFonts,
charactersPerGlyph );
}
+ const Length numberOfGlyphs = glyphs.Count();
+
if( GET_GLYPH_METRICS & operations )
{
- mImpl->mFontClient.GetGlyphMetrics( glyphs.Begin(), glyphs.Count() );
+ mImpl->mFontClient.GetGlyphMetrics( glyphs.Begin(), numberOfGlyphs );
}
- Length numberOfGlyphs = glyphs.Count();
if( 0u != numberOfGlyphs )
{
- // Sets the glyphs into the model.
- mImpl->mVisualModel->SetGlyphs( glyphs.Begin(),
- glyphsToCharactersMap.Begin(),
- charactersPerGlyph.Begin(),
- 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,
+ OperationsMask operationsRequired,
+ Size& layoutSize )
+{
+ bool viewUpdated( false );
+
+ // Calculate the operations to be done.
+ const OperationsMask operations = static_cast<OperationsMask>( mImpl->mOperationsPending & operationsRequired );
if( LAYOUT & operations )
{
// Fill the vectors again.
const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters();
- numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs();
+ Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs();
- if( 0u == lineBreakInfo.Count() )
- {
- lineBreakInfo.Resize( numberOfCharacters );
- mImpl->mLogicalModel->GetLineBreakInfo( lineBreakInfo.Begin(),
- 0u,
- numberOfCharacters );
- }
-
- if( 0u == wordBreakInfo.Count() )
- {
- wordBreakInfo.Resize( numberOfCharacters );
- mImpl->mLogicalModel->GetWordBreakInfo( wordBreakInfo.Begin(),
- 0u,
- numberOfCharacters );
- }
-
- if( 0u == glyphs.Count() )
- {
- glyphs.Resize( numberOfGlyphs );
- mImpl->mVisualModel->GetGlyphs( glyphs.Begin(),
- 0u,
- numberOfGlyphs );
- }
-
- if( 0u == glyphsToCharactersMap.Count() )
- {
- glyphsToCharactersMap.Resize( numberOfGlyphs );
- mImpl->mVisualModel->GetGlyphToCharacterMap( glyphsToCharactersMap.Begin(),
- 0u,
- numberOfGlyphs );
- }
-
- if( 0u == charactersPerGlyph.Count() )
- {
- charactersPerGlyph.Resize( numberOfGlyphs );
- mImpl->mVisualModel->GetCharactersPerGlyphMap( charactersPerGlyph.Begin(),
- 0u,
- numberOfGlyphs );
- }
+ Vector<LineBreakInfo>& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo;
+ Vector<WordBreakInfo>& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo;
+ Vector<GlyphInfo>& glyphs = mImpl->mVisualModel->mGlyphs;
+ Vector<CharacterIndex>& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters;
+ Vector<Length>& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph;
// Set the layout parameters.
LayoutParameters layoutParameters( size,
glyphsToCharactersMap.Begin(),
charactersPerGlyph.Begin() );
- // Reserve space to set the positions of the glyphs.
- Vector<Vector2> glyphPositions;
- glyphPositions.Resize( numberOfGlyphs );
-
// The laid-out lines.
// It's not possible to know in how many lines the text is going to be laid-out,
// but it can be resized at least with the number of 'paragraphs' to avoid
// some re-allocations.
- Vector<LineRun> lines;
- lines.Reserve( mImpl->mLogicalModel->GetNumberOfBidirectionalInfoRuns( 0u, numberOfCharacters ) );
+ Vector<LineRun>& lines = mImpl->mVisualModel->mLines;
+
+ // Resize the vector of positions to have the same size than the vector of glyphs.
+ Vector<Vector2>& 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,
// Reorder the lines
if( REORDER & operations )
{
- const Length numberOfBidiParagraphs = mImpl->mLogicalModel->GetNumberOfBidirectionalInfoRuns( 0u, numberOfCharacters );
-
- if( 0u == bidirectionalInfo.Count() )
- {
- bidirectionalInfo.Resize( numberOfBidiParagraphs );
- mImpl->mLogicalModel->GetBidirectionalInfo( bidirectionalInfo.Begin(),
- 0u,
- numberOfCharacters );
- }
+ Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo;
// Check first if there are paragraphs with bidirectional info.
if( 0u != bidirectionalInfo.Count() )
layoutParameters.numberOfBidirectionalInfoRuns = numberOfBidirectionalInfoRuns;
// Get the character to glyph conversion table and set into the layout.
- Vector<GlyphIndex> characterToGlyphMap;
- characterToGlyphMap.Resize( numberOfCharacters );
-
- layoutParameters.charactersToGlyphsBuffer = characterToGlyphMap.Begin();
- mImpl->mVisualModel->GetCharacterToGlyphMap( layoutParameters.charactersToGlyphsBuffer,
- 0u,
- numberOfCharacters );
+ layoutParameters.charactersToGlyphsBuffer = mImpl->mVisualModel->mCharactersToGlyph.Begin();
// Get the glyphs per character table and set into the layout.
- Vector<Length> glyphsPerCharacter;
- glyphsPerCharacter.Resize( numberOfCharacters );
-
- layoutParameters.glyphsPerCharacterBuffer = glyphsPerCharacter.Begin();
- mImpl->mVisualModel->GetGlyphsPerCharacterMap( layoutParameters.glyphsPerCharacterBuffer,
- 0u,
- numberOfCharacters );
+ layoutParameters.glyphsPerCharacterBuffer = mImpl->mVisualModel->mGlyphsPerCharacter.Begin();
// Re-layout the text. Reorder those lines with right to left characters.
mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters,
}
}
- // Sets the positions into the model.
- if( UPDATE_POSITIONS & operations )
- {
- mImpl->mVisualModel->SetGlyphPositions( glyphPositions.Begin(),
- numberOfGlyphs );
- }
-
- // Sets the lines into the model.
- if( UPDATE_LINES & operations )
- {
- mImpl->mVisualModel->SetLines( lines.Begin(),
- lines.Count() );
- }
-
// Sets the actual size.
if( UPDATE_ACTUAL_SIZE & operations )
{
return viewUpdated;
}
-Vector3 Controller::GetNaturalSize()
-{
- Vector3 naturalSize;
-
- if( mImpl->mRecalculateNaturalSize )
- {
- // Operations that can be done only once until the text changes.
- const OperationsMask onlyOnceOperations = static_cast<OperationsMask>( CONVERT_TO_UTF32 |
- GET_SCRIPTS |
- VALIDATE_FONTS |
- GET_LINE_BREAKS |
- GET_WORD_BREAKS |
- SHAPE_TEXT |
- GET_GLYPH_METRICS );
-
- // Operations that need to be done if the size changes.
- const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
- REORDER );
-
- DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ),
- static_cast<OperationsMask>( onlyOnceOperations |
- sizeOperations ),
- naturalSize.GetVectorXY() );
-
- // Do not do again the only once operations.
- mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending & ~onlyOnceOperations );
-
- // Do the size related operations again.
- mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending | sizeOperations );
-
- // Stores the natural size to avoid recalculate it again
- // unless the text/style changes.
- mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() );
-
- mImpl->mRecalculateNaturalSize = false;
- }
- else
- {
- naturalSize = mImpl->mVisualModel->GetNaturalSize();
- }
-
- return naturalSize;
-}
-
-float Controller::GetHeightForWidth( float width )
-{
- Size layoutSize;
- if( width != mImpl->mControlSize.width )
- {
- // Operations that can be done only once until the text changes.
- const OperationsMask onlyOnceOperations = static_cast<OperationsMask>( CONVERT_TO_UTF32 |
- GET_SCRIPTS |
- VALIDATE_FONTS |
- GET_LINE_BREAKS |
- GET_WORD_BREAKS |
- SHAPE_TEXT |
- GET_GLYPH_METRICS );
-
- // Operations that need to be done if the size changes.
- const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
- REORDER );
-
- DoRelayout( Size( width, MAX_FLOAT ),
- static_cast<OperationsMask>( onlyOnceOperations |
- sizeOperations ),
- layoutSize );
-
- // Do not do again the only once operations.
- mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending & ~onlyOnceOperations );
-
- // Do the size related operations again.
- mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending | sizeOperations );
- }
- else
- {
- layoutSize = mImpl->mVisualModel->GetActualSize();
- }
-
- return layoutSize.height;
-}
-
View& Controller::GetView()
{
return mImpl->mView;
{
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 )
{
- event.p2.mString = new char[keyString.size() + 1];
- std::copy(keyString.begin(), keyString.end(), event.p2.mString);
- event.p2.mString[keyString.size()] = '\0';
+ // 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 )
+ {
+ 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 );
RequestRelayout();
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff