am 2ecf6254
: Merge "Restricting children for gesture input." into jb-mr1-dev
* commit '2ecf6254a7e21ab33995ed7cb07c2b8a4f825038': Restricting children for gesture input.
This commit is contained in:
commit
d78a832c6d
5 changed files with 71 additions and 5 deletions
|
@ -327,6 +327,9 @@ static inline void prof_out(void) {
|
|||
// Max Distance between point to key
|
||||
#define MAX_POINT_TO_KEY_LENGTH 10000000
|
||||
|
||||
// The max number of the keys in one keyboard layout
|
||||
#define MAX_KEY_COUNT_IN_A_KEYBOARD 64
|
||||
|
||||
// TODO: Reduce this constant if possible; check the maximum number of digraphs in the same
|
||||
// word in the dictionary for languages with digraphs, like German and French
|
||||
#define DEFAULT_MAX_DIGRAPH_SEARCH_DEPTH 5
|
||||
|
|
|
@ -62,6 +62,7 @@ ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr, const int ma
|
|||
CELL_WIDTH((keyboardWidth + gridWidth - 1) / gridWidth),
|
||||
CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight),
|
||||
KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)),
|
||||
KEYBOARD_WIDTH(keyboardWidth), KEYBOARD_HEIGHT(keyboardHeight),
|
||||
HAS_TOUCH_POSITION_CORRECTION_DATA(keyCount > 0 && keyXCoordinates && keyYCoordinates
|
||||
&& keyWidths && keyHeights && keyCharCodes && sweetSpotCenterXs
|
||||
&& sweetSpotCenterYs && sweetSpotRadii),
|
||||
|
|
|
@ -96,6 +96,14 @@ class ProximityInfo {
|
|||
return GRID_HEIGHT;
|
||||
}
|
||||
|
||||
int getKeyboardWidth() const {
|
||||
return KEYBOARD_WIDTH;
|
||||
}
|
||||
|
||||
int getKeyboardHeight() const {
|
||||
return KEYBOARD_HEIGHT;
|
||||
}
|
||||
|
||||
// TODO: These should return int.
|
||||
float getKeyCenterXOfCodePointG(int charCode) const;
|
||||
float getKeyCenterYOfCodePointG(int charCode) const;
|
||||
|
@ -105,8 +113,6 @@ class ProximityInfo {
|
|||
|
||||
private:
|
||||
DISALLOW_IMPLICIT_CONSTRUCTORS(ProximityInfo);
|
||||
// The max number of the keys in one keyboard layout
|
||||
static const int MAX_KEY_COUNT_IN_A_KEYBOARD = 64;
|
||||
// The upper limit of the char code in mCodePointToKeyIndex
|
||||
static const int MAX_CHAR_CODE = 127;
|
||||
static const float NOT_A_DISTANCE_FLOAT;
|
||||
|
@ -136,6 +142,8 @@ class ProximityInfo {
|
|||
const int CELL_WIDTH;
|
||||
const int CELL_HEIGHT;
|
||||
const int KEY_COUNT;
|
||||
const int KEYBOARD_WIDTH;
|
||||
const int KEYBOARD_HEIGHT;
|
||||
const bool HAS_TOUCH_POSITION_CORRECTION_DATA;
|
||||
char mLocaleStr[MAX_LOCALE_STRING_LENGTH];
|
||||
int32_t *mProximityCharsArray;
|
||||
|
|
|
@ -76,6 +76,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
|
|||
mTimes.clear();
|
||||
mLengthCache.clear();
|
||||
mDistanceCache.clear();
|
||||
mNearKeysVector.clear();
|
||||
mInputSize = 0;
|
||||
|
||||
if (xCoordinates && yCoordinates) {
|
||||
|
@ -122,14 +123,34 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
|
|||
|
||||
if (mInputSize > 0) {
|
||||
const int keyCount = mProximityInfo->getKeyCount();
|
||||
mNearKeysVector.resize(mInputSize);
|
||||
mDistanceCache.resize(mInputSize * keyCount);
|
||||
for (int i = 0; i < mInputSize; ++i) {
|
||||
mNearKeysVector[i].reset();
|
||||
static const float NEAR_KEY_NORMALIZED_SQUARED_THRESHOLD = 4.0f;
|
||||
for (int k = 0; k < keyCount; ++k) {
|
||||
const int index = i * keyCount + k;
|
||||
const int x = mInputXs[i];
|
||||
const int y = mInputYs[i];
|
||||
mDistanceCache[index] =
|
||||
const float normalizedSquaredDistance =
|
||||
mProximityInfo->getNormalizedSquaredDistanceFromCenterFloat(k, x, y);
|
||||
mDistanceCache[index] = normalizedSquaredDistance;
|
||||
if (normalizedSquaredDistance < NEAR_KEY_NORMALIZED_SQUARED_THRESHOLD) {
|
||||
mNearKeysVector[i].set(k, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static const float READ_FORWORD_LENGTH_SCALE = 0.95f;
|
||||
const int readForwordLength = static_cast<int>(
|
||||
hypotf(mProximityInfo->getKeyboardWidth(), mProximityInfo->getKeyboardHeight())
|
||||
* READ_FORWORD_LENGTH_SCALE);
|
||||
for (int i = 0; i < mInputSize; ++i) {
|
||||
for (int j = i + 1; j < mInputSize; ++j) {
|
||||
if (mLengthCache[j] - mLengthCache[i] >= readForwordLength) {
|
||||
break;
|
||||
}
|
||||
mNearKeysVector[i] |= mNearKeysVector[j];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -182,7 +203,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
|
|||
// the given point and the nearest key position.
|
||||
float ProximityInfoState::updateNearKeysDistances(const int x, const int y,
|
||||
NearKeysDistanceMap *const currentNearKeysDistances) {
|
||||
static const float NEAR_KEY_THRESHOLD = 10.0f;
|
||||
static const float NEAR_KEY_THRESHOLD = 4.0f;
|
||||
|
||||
currentNearKeysDistances->clear();
|
||||
const int keyCount = mProximityInfo->getKeyCount();
|
||||
|
@ -394,4 +415,30 @@ float ProximityInfoState::calculateSquaredDistanceFromSweetSpotCenter(
|
|||
const float inputY = static_cast<float>(mInputYs[inputIndex]);
|
||||
return square(inputX - sweetSpotCenterX) + square(inputY - sweetSpotCenterY);
|
||||
}
|
||||
|
||||
// Puts possible characters into filter and returns new filter size.
|
||||
int32_t ProximityInfoState::getAllPossibleChars(
|
||||
const size_t index, int32_t *const filter, const int32_t filterSize) const {
|
||||
if (index >= mInputXs.size()) {
|
||||
return filterSize;
|
||||
}
|
||||
int i = filterSize;
|
||||
for (int j = 0; j < mProximityInfo->getKeyCount(); ++j) {
|
||||
if (mNearKeysVector[index].test(j)) {
|
||||
const int32_t keyCodePoint = mProximityInfo->getCodePointOf(j);
|
||||
bool insert = true;
|
||||
// TODO: Avoid linear search
|
||||
for (int k = 0; k < filterSize; ++k) {
|
||||
if (filter[k] == keyCodePoint) {
|
||||
insert = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (insert) {
|
||||
filter[i++] = keyCodePoint;
|
||||
}
|
||||
}
|
||||
}
|
||||
return i;
|
||||
}
|
||||
} // namespace latinime
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#ifndef LATINIME_PROXIMITY_INFO_STATE_H
|
||||
#define LATINIME_PROXIMITY_INFO_STATE_H
|
||||
|
||||
#include <bitset>
|
||||
#include <cstring> // for memset()
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
|
@ -32,6 +33,7 @@ class ProximityInfo;
|
|||
|
||||
class ProximityInfoState {
|
||||
public:
|
||||
typedef std::bitset<MAX_KEY_COUNT_IN_A_KEYBOARD> NearKeycodesSet;
|
||||
static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2 = 10;
|
||||
static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR =
|
||||
1 << NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2;
|
||||
|
@ -56,7 +58,8 @@ class ProximityInfoState {
|
|||
mHasTouchPositionCorrectionData(false), mMostCommonKeyWidthSquare(0), mLocaleStr(),
|
||||
mKeyCount(0), mCellHeight(0), mCellWidth(0), mGridHeight(0), mGridWidth(0),
|
||||
mInputXs(), mInputYs(), mTimes(), mDistanceCache(), mLengthCache(),
|
||||
mTouchPositionCorrectionEnabled(false), mInputSize(0) {
|
||||
mNearKeysVector(), mTouchPositionCorrectionEnabled(false),
|
||||
mInputSize(0) {
|
||||
memset(mInputCodes, 0, sizeof(mInputCodes));
|
||||
memset(mNormalizedSquaredDistances, 0, sizeof(mNormalizedSquaredDistances));
|
||||
memset(mPrimaryInputWord, 0, sizeof(mPrimaryInputWord));
|
||||
|
@ -215,6 +218,9 @@ class ProximityInfoState {
|
|||
|
||||
int getSpaceY();
|
||||
|
||||
int32_t getAllPossibleChars(
|
||||
const size_t startIndex, int32_t *const filter, int32_t filterSize) const;
|
||||
|
||||
private:
|
||||
DISALLOW_COPY_AND_ASSIGN(ProximityInfoState);
|
||||
typedef hash_map_compat<int, float> NearKeysDistanceMap;
|
||||
|
@ -272,6 +278,7 @@ class ProximityInfoState {
|
|||
std::vector<int> mTimes;
|
||||
std::vector<float> mDistanceCache;
|
||||
std::vector<int> mLengthCache;
|
||||
std::vector<NearKeycodesSet> mNearKeysVector;
|
||||
bool mTouchPositionCorrectionEnabled;
|
||||
int32_t mInputCodes[MAX_PROXIMITY_CHARS_SIZE_INTERNAL * MAX_WORD_LENGTH_INTERNAL];
|
||||
int mNormalizedSquaredDistances[MAX_PROXIMITY_CHARS_SIZE_INTERNAL * MAX_WORD_LENGTH_INTERNAL];
|
||||
|
|
Loading…
Reference in a new issue