}
}
+ if( mEventData->mUpdateCursorPosition ||
+ mEventData->mUpdateLeftSelectionPosition ||
+ mEventData->mUpdateRightSelectionPosition )
+ {
+ NotifyImfManager();
+ }
+
// The cursor must also be repositioned after inserts into the model
if( mEventData->mUpdateCursorPosition )
{
return decoratorUpdated;
}
+void Controller::Impl::NotifyImfManager()
+{
+ if( mEventData && mEventData->mImfManager )
+ {
+ CharacterIndex cursorPosition = GetLogicalCursorPosition();
+
+ const Length numberOfWhiteSpaces = GetNumberOfWhiteSpaces( 0u );
+
+ // Update the cursor position by removing the initial white spaces.
+ if( cursorPosition < numberOfWhiteSpaces )
+ {
+ cursorPosition = 0u;
+ }
+ else
+ {
+ cursorPosition -= numberOfWhiteSpaces;
+ }
+
+ mEventData->mImfManager.SetCursorPosition( cursorPosition );
+ mEventData->mImfManager.NotifyCursorPosition();
+ }
+}
+
+CharacterIndex Controller::Impl::GetLogicalCursorPosition() const
+{
+ CharacterIndex cursorPosition = 0u;
+
+ if( mEventData )
+ {
+ if( ( EventData::SELECTING == mEventData->mState ) ||
+ ( EventData::SELECTION_HANDLE_PANNING == mEventData->mState ) )
+ {
+ cursorPosition = std::min( mEventData->mRightSelectionPosition, mEventData->mLeftSelectionPosition );
+ }
+ else
+ {
+ cursorPosition = mEventData->mPrimaryCursorPosition;
+ }
+ }
+
+ return cursorPosition;
+}
+
+Length Controller::Impl::GetNumberOfWhiteSpaces( CharacterIndex index ) const
+{
+ Length numberOfWhiteSpaces = 0u;
+
+ // Get the buffer to the text.
+ Character* utf32CharacterBuffer = mLogicalModel->mText.Begin();
+
+ const Length totalNumberOfCharacters = mLogicalModel->mText.Count();
+ for( ; index < totalNumberOfCharacters; ++index, ++numberOfWhiteSpaces )
+ {
+ if( !TextAbstraction::IsWhiteSpace( *( utf32CharacterBuffer + index ) ) )
+ {
+ break;
+ }
+ }
+
+ return numberOfWhiteSpaces;
+}
+
+void Controller::Impl::GetText( CharacterIndex index, std::string& text ) const
+{
+ // Get the total number of characters.
+ Length numberOfCharacters = mLogicalModel->mText.Count();
+
+ // Retrieve the text.
+ if( 0u != numberOfCharacters )
+ {
+ Utf32ToUtf8( mLogicalModel->mText.Begin() + index, numberOfCharacters - index, text );
+ }
+}
+
void Controller::Impl::CalculateTextUpdateIndices( Length& numberOfCharacters )
{
mTextUpdateInfo.mParagraphCharacterIndex = 0u;
mImpl->mEventData->mEventQueue.clear();
}
- // Notify IMF as text changed
- NotifyImfManager();
-
// Do this last since it provides callbacks into application code
mImpl->mControlInterface.TextChanged();
}
{
if( !mImpl->IsShowingPlaceholderText() )
{
- Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
-
- if( 0u != utf32Characters.Count() )
- {
- Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), text );
- }
+ // Retrieves the text string.
+ mImpl->GetText( 0u, text );
}
else
{
}
}
-unsigned int Controller::GetLogicalCursorPosition() const
-{
- if( NULL != mImpl->mEventData )
- {
- return mImpl->mEventData->mPrimaryCursorPosition;
- }
-
- return 0u;
-}
-
void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text )
{
if( NULL != mImpl->mEventData )
textChanged = true;
}
- if( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) &&
- ( mImpl->mEventData->mState != EventData::INACTIVE ) )
+ if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) &&
+ ( mImpl->mEventData->mState != EventData::INACTIVE ) &&
+ ( Dali::DALI_KEY_SHIFT_LEFT != keyCode ) )
{
+ // Should not change the state if the key is the shift send by the imf manager.
+ // Otherwise, when the state is SELECTING the text controller can't send the right
+ // surrounding info to the imf.
mImpl->ChangeState( EventData::EDITING );
}
mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text
mImpl->mOperationsPending = ALL_OPERATIONS;
- // This is to reset the virtual keyboard to Upper-case
- if( 0u == mImpl->mLogicalModel->mText.Count() )
- {
- NotifyImfManager();
- }
-
if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||
!mImpl->IsPlaceholderAvailable() )
{
ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent )
{
- bool update = false;
+ // Whether the text needs to be relaid-out.
bool requestRelayout = false;
- std::string text;
- unsigned int cursorPosition = 0u;
+ // Whether to retrieve the text and cursor position to be sent to the IMF manager.
+ bool retrieveText = false;
+ bool retrieveCursor = false;
switch( imfEvent.eventName )
{
case ImfManager::COMMIT:
{
InsertText( imfEvent.predictiveString, Text::Controller::COMMIT );
- update = true;
requestRelayout = true;
+ retrieveCursor = true;
break;
}
case ImfManager::PREEDIT:
{
InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT );
- update = true;
requestRelayout = true;
+ retrieveCursor = true;
break;
}
case ImfManager::DELETESURROUNDING:
{
- update = RemoveText( imfEvent.cursorOffset,
- imfEvent.numberOfChars,
- DONT_UPDATE_INPUT_STYLE );
+ const bool textDeleted = RemoveText( imfEvent.cursorOffset,
+ imfEvent.numberOfChars,
+ DONT_UPDATE_INPUT_STYLE );
- if( update )
+ if( textDeleted )
{
if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||
!mImpl->IsPlaceholderAvailable() )
}
mImpl->mEventData->mUpdateCursorPosition = true;
mImpl->mEventData->mScrollAfterDelete = true;
+
+ requestRelayout = true;
+ retrieveCursor = true;
}
- requestRelayout = true;
break;
}
case ImfManager::GETSURROUNDING:
{
- GetText( text );
- cursorPosition = GetLogicalCursorPosition();
-
- imfManager.SetSurroundingText( text );
- imfManager.SetCursorPosition( cursorPosition );
+ retrieveText = true;
+ retrieveCursor = true;
break;
}
case ImfManager::VOID:
}
} // end switch
- if( ImfManager::GETSURROUNDING != imfEvent.eventName )
- {
- GetText( text );
- cursorPosition = GetLogicalCursorPosition();
- }
-
if( requestRelayout )
{
mImpl->mOperationsPending = ALL_OPERATIONS;
mImpl->mControlInterface.TextChanged();
}
- ImfManager::ImfCallbackData callbackData( update, cursorPosition, text, false );
+ std::string text;
+ CharacterIndex cursorPosition = 0u;
+ Length numberOfWhiteSpaces = 0u;
+
+ if( retrieveCursor )
+ {
+ numberOfWhiteSpaces = mImpl->GetNumberOfWhiteSpaces( 0u );
+
+ cursorPosition = mImpl->GetLogicalCursorPosition();
+
+ if( cursorPosition < numberOfWhiteSpaces )
+ {
+ cursorPosition = 0u;
+ }
+ else
+ {
+ cursorPosition -= numberOfWhiteSpaces;
+ }
+ }
+
+ if( retrieveText )
+ {
+ mImpl->GetText( numberOfWhiteSpaces, text );
+ }
+
+ ImfManager::ImfCallbackData callbackData( ( retrieveText || retrieveCursor ), cursorPosition, text, false );
return callbackData;
}
if( removed )
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE RemovedText\n", this );
- // Notifiy the IMF manager after text changed
- // Automatic Upper-case and restarting prediction on an existing word require this.
- NotifyImfManager();
-
if( ( 0u != mImpl->mLogicalModel->mText.Count() ) ||
!mImpl->IsPlaceholderAvailable() )
{
return removed;
}
-void Controller::NotifyImfManager()
-{
- if( NULL != mImpl->mEventData )
- {
- if( mImpl->mEventData->mImfManager )
- {
- // Notifying IMF of a cursor change triggers a surrounding text request so updating it now.
- std::string text;
- GetText( text );
- mImpl->mEventData->mImfManager.SetSurroundingText( text );
-
- mImpl->mEventData->mImfManager.SetCursorPosition( GetLogicalCursorPosition() );
- mImpl->mEventData->mImfManager.NotifyCursorPosition();
- }
- }
-}
-
void Controller::ShowPlaceholderText()
{
if( mImpl->IsPlaceholderAvailable() )