Removes the usage of OVUTF8Helper in the key handler.
This commit is contained in:
parent
8e1e3d184b
commit
4743889e2f
|
@ -38,7 +38,6 @@ using namespace std;
|
|||
using namespace Formosa::Mandarin;
|
||||
using namespace Formosa::Gramambular;
|
||||
using namespace McBopomofo;
|
||||
using namespace OpenVanilla;
|
||||
|
||||
InputMode InputModeBopomofo = @"org.openvanilla.inputmethod.McBopomofo.Bopomofo";
|
||||
InputMode InputModePlainBopomofo = @"org.openvanilla.inputmethod.McBopomofo.PlainBopomofo";
|
||||
|
@ -1143,12 +1142,12 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot
|
|||
for (vector<NodeAnchor>::iterator wi = _walkedNodes.begin(), we = _walkedNodes.end(); wi != we; ++wi) {
|
||||
if ((*wi).node) {
|
||||
string nodeStr = (*wi).node->currentKeyValue().value;
|
||||
vector<string> codepoints = OVUTF8Helper::SplitStringByCodePoint(nodeStr);
|
||||
size_t codepointCount = codepoints.size();
|
||||
|
||||
NSString *valueString = [NSString stringWithUTF8String:nodeStr.c_str()];
|
||||
[composingBuffer appendString:valueString];
|
||||
|
||||
NSArray *splited = [valueString split];
|
||||
NSInteger codepointCount = splited.count;
|
||||
|
||||
// this re-aligns the cursor index in the composed string
|
||||
// (the actual cursor on the screen) with the builder's logical
|
||||
// cursor (reading) cursor; each built node has a "spanning length"
|
||||
|
@ -1162,7 +1161,7 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot
|
|||
} else {
|
||||
if (codepointCount == spanningLength) {
|
||||
for (size_t i = 0; i < codepointCount && readingCursorIndex < builderCursorIndex; i++) {
|
||||
composedStringCursorIndex += [[NSString stringWithUTF8String:codepoints[i].c_str()] length];
|
||||
composedStringCursorIndex += [splited[i] length];
|
||||
readingCursorIndex++;
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -70,4 +70,10 @@ extension NSString {
|
|||
@objc var count: Int {
|
||||
(self as String).count
|
||||
}
|
||||
|
||||
@objc var split: [NSString] {
|
||||
Array(self as String).map {
|
||||
NSString(string: String($0))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue