X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fcursor-helper-functions.cpp;h=b847996aecbdace15c1bfae3b11ef49a79fdd6a0;hb=3f83c5b8d17c02cb06043bd1d30ce4d4321f941c;hp=9c95650e277fa69ce74eec7e2cd2eec089a23b5c;hpb=1bd947edf624ffee8fd4b6ce43c53a9b08513e0f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/cursor-helper-functions.cpp b/dali-toolkit/internal/text/cursor-helper-functions.cpp index 9c95650..b847996 100644 --- a/dali-toolkit/internal/text/cursor-helper-functions.cpp +++ b/dali-toolkit/internal/text/cursor-helper-functions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ struct FindWordData : textBuffer( textBuffer ), totalNumberOfCharacters( totalNumberOfCharacters ), hitCharacter( hitCharacter ), - foundIndex( 0u ), + foundIndex( 0 ), isWhiteSpace( isWhiteSpace ), isNewParagraph( isNewParagraph ) {} @@ -136,10 +136,17 @@ namespace Text { LineIndex GetClosestLine( VisualModelPtr visualModel, - float visualY ) + float visualY, + bool& matchedLine ) { float totalHeight = 0.f; - LineIndex lineIndex = 0u; + LineIndex lineIndex = 0; + matchedLine = false; + + if( visualY < 0.f ) + { + return 0; + } const Vector& lines = visualModel->mLines; @@ -156,16 +163,17 @@ LineIndex GetClosestLine( VisualModelPtr visualModel, if( visualY < totalHeight ) { + matchedLine = true; return lineIndex; } } - if( lineIndex == 0u ) + if( lineIndex == 0 ) { return 0; } - return lineIndex-1; + return lineIndex - 1u; } float CalculateLineOffset( const Vector& lines, @@ -192,23 +200,38 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, LogicalModelPtr logicalModel, MetricsPtr metrics, float visualX, - float visualY ) + float visualY, + CharacterHitTest::Mode mode, + bool& matchedCharacter ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "GetClosestCursorIndex, closest visualX %f visualY %f\n", visualX, visualY ); - CharacterIndex logicalIndex = 0u; + // Whether there is a hit on a glyph. + matchedCharacter = false; + + CharacterIndex logicalIndex = 0; - const Length numberOfGlyphs = visualModel->mGlyphs.Count(); - const Length numberOfLines = visualModel->mLines.Count(); - if( ( 0 == numberOfGlyphs ) || - ( 0 == numberOfLines ) ) + const Length totalNumberOfGlyphs = visualModel->mGlyphs.Count(); + const Length totalNumberOfLines = visualModel->mLines.Count(); + if( ( 0 == totalNumberOfGlyphs ) || + ( 0 == totalNumberOfLines ) ) { return logicalIndex; } + // Whether there is a hit on a line. + bool matchedLine = false; + // Find which line is closest. const LineIndex lineIndex = Text::GetClosestLine( visualModel, - visualY ); + visualY, + matchedLine ); + + if( !matchedLine && ( CharacterHitTest::TAP == mode ) ) + { + // Return the first or the last character if the touch point doesn't hit a line. + return ( visualY < 0.f ) ? 0 : logicalModel->mText.Count(); + } // Convert from text's coords to line's coords. const LineRun& line = *( visualModel->mLines.Begin() + lineIndex ); @@ -241,12 +264,12 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, // The character's direction buffer. const CharacterDirection* const directionsBuffer = bidiLineFetched ? logicalModel->mCharacterDirections.Begin() : NULL; - // Whether there is a hit on a glyph. - bool matched = false; + // Whether the touch point if before the first glyph. + bool isBeforeFirstGlyph = false; // Traverses glyphs in visual order. To do that use the visual to logical conversion table. CharacterIndex visualIndex = startCharacter; - Length numberOfVisualCharacters = 0u; + Length numberOfVisualCharacters = 0; for( ; visualIndex < endCharacter; ++visualIndex ) { // The character in logical order. @@ -257,7 +280,7 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, const Length numberOfGlyphs = *( glyphsPerCharacterBuffer + characterLogicalOrderIndex ); ++numberOfVisualCharacters; - if( 0u != numberOfGlyphs ) + if( 0 != numberOfGlyphs ) { // Get the first character/glyph of the group of glyphs. const CharacterIndex firstVisualCharacterIndex = 1u + visualIndex - numberOfVisualCharacters; @@ -275,14 +298,54 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, // Get the position of the first glyph. const Vector2& position = *( positionsBuffer + firstLogicalGlyphIndex ); - // Whether the glyph can be split, like Latin ligatures fi, ff or Arabic ﻻ. - const Length numberOfCharacters = *( charactersPerGlyphBuffer + firstLogicalGlyphIndex ); + if( startCharacter == visualIndex ) + { + const float glyphPosition = -glyphMetrics.xBearing + position.x; + + if( visualX < glyphPosition ) + { + isBeforeFirstGlyph = true; + break; + } + } + + // Whether the glyph can be split, like Latin ligatures fi, ff or Arabic (ل + ا). + Length numberOfCharacters = *( charactersPerGlyphBuffer + firstLogicalGlyphIndex ); if( direction != LTR ) { // As characters are being traversed in visual order, // for right to left ligatures, the character which contains the // number of glyphs in the table is found first. // Jump the number of characters to the next glyph is needed. + + if( 0 == numberOfCharacters ) + { + // TODO: This is a workaround to fix an issue with complex characters in the arabic + // script like i.e. رّ or الأَبْجَدِيَّة العَرَبِيَّة + // There are characters that are not shaped in one glyph but in combination with + // the next one generates two of them. + // The visual to logical conversion table have characters in different order than + // expected even if all of them are arabic. + + // The workaround doesn't fix the issue completely but it prevents the application + // to hang in an infinite loop. + + // Find the number of characters. + for( GlyphIndex index = firstLogicalGlyphIndex + 1u; + ( 0 == numberOfCharacters ) && ( index < totalNumberOfGlyphs ); + ++index ) + { + numberOfCharacters = *( charactersPerGlyphBuffer + index ); + } + + if( 2u > numberOfCharacters ) + { + continue; + } + + --numberOfCharacters; + } + visualIndex += numberOfCharacters - 1u; } @@ -293,7 +356,7 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, const Length numberOfBlocks = isInterglyphIndex ? numberOfCharacters : 1u; const float glyphAdvance = glyphMetrics.advance / static_cast( numberOfBlocks ); - CharacterIndex index = 0u; + CharacterIndex index = 0; for( ; index < numberOfBlocks; ++index ) { // Find the mid-point of the area containing the glyph @@ -301,31 +364,39 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, if( visualX < glyphCenter ) { - matched = true; + matchedCharacter = true; break; } } - if( matched ) + if( matchedCharacter ) { // If the glyph is shaped from more than one character, it matches the character of the glyph. visualIndex = firstVisualCharacterIndex + index; break; } - numberOfVisualCharacters = 0u; + numberOfVisualCharacters = 0; } - } + } // for characters in visual order. // The number of characters of the whole text. const Length totalNumberOfCharacters = logicalModel->mText.Count(); // Return the logical position of the cursor in characters. - if( !matched ) + if( !matchedCharacter ) { - // If no character is matched, then the last character (in visual order) of the line is used. - visualIndex = endCharacter; + if( isBeforeFirstGlyph ) + { + // If no character is matched, then the first character (in visual order) of the line is used. + visualIndex = startCharacter; + } + else + { + // If no character is matched, then the last character (in visual order) of the line is used. + visualIndex = endCharacter; + } } // Get the paragraph direction. @@ -355,7 +426,7 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, { // The paragraph direction is right to left. - if( ( lineIndex != numberOfLines - 1u ) && // is not the last line. + if( ( lineIndex != totalNumberOfLines - 1u ) && // is not the last line. ( visualIndex == startCharacter ) ) { // It places the cursor just after the first character in visual order. @@ -376,7 +447,7 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, // This branch checks if the closest line is the one with the last '\n'. If it is, it decrements the visual index to place // the cursor just before the last '\n'. - if( ( lineIndex != numberOfLines - 1u ) && + if( ( lineIndex != totalNumberOfLines - 1u ) && TextAbstraction::IsNewParagraph( *( logicalModel->mText.Begin() + visualIndex - 1u ) ) ) { --visualIndex; @@ -582,7 +653,7 @@ void GetCursorPosition( VisualModelPtr visualModel, isCurrentRightToLeft = *( directionsBuffer + index ); } - Length numberOfGlyphAdvance = ( isFirstPositionOfLine ? 0u : 1u ) + characterIndex - firstIndex; + Length numberOfGlyphAdvance = ( isFirstPositionOfLine ? 0 : 1u ) + characterIndex - firstIndex; if( isCurrentRightToLeft ) { numberOfGlyphAdvance = primaryNumberOfCharacters - numberOfGlyphAdvance; @@ -663,9 +734,9 @@ bool FindSelectionIndices( VisualModelPtr visualModel, float visualX, float visualY, CharacterIndex& startIndex, - CharacterIndex& endIndex ) + CharacterIndex& endIndex, + CharacterIndex& noTextHitIndex ) { - /* Hit character Select |-------------------------------------------------------|------------------------------------------| @@ -676,23 +747,33 @@ bool FindSelectionIndices( VisualModelPtr visualModel, | On a new paragraph character | The word or group of white spaces before | |-------------------------------------------------------|------------------------------------------| */ + const Length totalNumberOfCharacters = logicalModel->mText.Count(); + startIndex = 0; + endIndex = 0; + noTextHitIndex = 0; + if( 0 == totalNumberOfCharacters ) + { + // Nothing to do if the model is empty. + return false; + } + + bool matchedCharacter = false; CharacterIndex hitCharacter = Text::GetClosestCursorIndex( visualModel, logicalModel, metrics, visualX, - visualY ); - - const Length totalNumberOfCharacters = logicalModel->mText.Count(); - - DALI_ASSERT_DEBUG( ( hitCharacter <= totalNumberOfCharacters ) && "GetClosestCursorIndex returned out of bounds index" ); + visualY, + CharacterHitTest::TAP, + matchedCharacter ); - if( 0u == totalNumberOfCharacters ) + if( !matchedCharacter ) { - // Nothing to do if the model is empty. - return false; + noTextHitIndex = hitCharacter; } + DALI_ASSERT_DEBUG( ( hitCharacter <= totalNumberOfCharacters ) && "GetClosestCursorIndex returned out of bounds index" ); + if( hitCharacter >= totalNumberOfCharacters ) { // Closest hit character is the last character. @@ -728,7 +809,7 @@ bool FindSelectionIndices( VisualModelPtr visualModel, { // Find the first character before the hit one which is not a new paragraph character. - if( hitCharacter > 0u ) + if( hitCharacter > 0 ) { endIndex = hitCharacter - 1u; for( ; endIndex > 0; --endIndex ) @@ -761,13 +842,13 @@ bool FindSelectionIndices( VisualModelPtr visualModel, { // Select the word before or after the white space - if( 0u == hitCharacter ) + if( 0 == hitCharacter ) { data.isWhiteSpace = false; FindEndOfWord( data ); endIndex = data.foundIndex; } - else if( hitCharacter > 0u ) + else if( hitCharacter > 0 ) { // Find the start of the word. data.hitCharacter = hitCharacter - 1u; @@ -780,7 +861,7 @@ bool FindSelectionIndices( VisualModelPtr visualModel, } } - return true; + return matchedCharacter; } } // namespace Text