floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes the state from handling enter in plain BPMF mode.

This commit is contained in:
zonble 2022-01-28 18:55:58 +08:00
parent 439bb99ef5
commit 618065b881
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/InputMethodController.mm
View File

@ -243,7 +243,7 @@ static inline NSString *LocalizationNotNeeded(NSString *s) {
BOOL result = [_keyHandler handleInput:input state:_state stateCallback:^(InputState *state) { BOOL result = [_keyHandler handleInput:input state:_state stateCallback:^(InputState *state) {
[self handleState:state client:client]; [self handleState:state client:client];
} candidateSelectionCallback:^{ } candidateSelectionCallback:^{
// NSLog(@"candidate window updated."); NSLog(@"candidate window updated.");
} errorCallback:^{ } errorCallback:^{
NSBeep(); NSBeep();
}]; }];
@ -295,7 +295,7 @@ static inline NSString *LocalizationNotNeeded(NSString *s) {
- (void)handleState:(InputState *)newState client:(id)client - (void)handleState:(InputState *)newState client:(id)client
{ {
// NSLog(@"current state: %@ new state: %@", _state, newState ); NSLog(@"new state: %@ / current state: %@", newState, _state);
// We need to set the state to the member variable since the candidate // We need to set the state to the member variable since the candidate
// window need to read the candidates from it. // window need to read the candidates from it.
@ -408,15 +408,8 @@ static inline NSString *LocalizationNotNeeded(NSString *s) {
// i.e. the client app needs to take care of where to put ths composing buffer // i.e. the client app needs to take care of where to put ths composing buffer
[client setMarkedText:attrString selectionRange:NSMakeRange(cursorIndex, 0) replacementRange:NSMakeRange(NSNotFound, NSNotFound)]; [client setMarkedText:attrString selectionRange:NSMakeRange(cursorIndex, 0) replacementRange:NSMakeRange(NSNotFound, NSNotFound)];
if (_keyHandler.inputMode == kPlainBopomofoModeIdentifier && state.candidates.count == 1) { if (![previous isKindOfClass:[InputStateChoosingCandidate class]]) {
NSString *buffer = [self _convertToSimplifiedChineseIfRequired:state.candidates.firstObject]; [self _showCandidateWindowWithState:state client:client];
[client insertText:buffer replacementRange:NSMakeRange(NSNotFound, NSNotFound)];
InputStateEmpty *empty = [[InputStateEmpty alloc] init];
[self handleState:empty client:client];
} else {
if (![previous isKindOfClass:[InputStateChoosingCandidate class]]) {
[self _showCandidateWindowWithState:state client:client];
}
} }
} }

22
Source/KeyHandler.mm
View File

@ -343,7 +343,15 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot
if (_inputMode == kPlainBopomofoModeIdentifier) { if (_inputMode == kPlainBopomofoModeIdentifier) {
InputStateChoosingCandidate *choosingCandidates = [self _buildCandidateState:inputting useVerticalMode:input.useVerticalMode]; InputStateChoosingCandidate *choosingCandidates = [self _buildCandidateState:inputting useVerticalMode:input.useVerticalMode];
stateCallback(choosingCandidates); if (choosingCandidates.candidates.count == 1) {
[self clear];
InputStateCommitting *committing = [[InputStateCommitting alloc] initWithPoppedText:choosingCandidates.candidates.firstObject];
stateCallback(committing);
InputStateEmpty *empty = [[InputStateEmpty alloc] init];
stateCallback(empty);
} else {
stateCallback(choosingCandidates);
}
} }
// and tells the client that the key is consumed // and tells the client that the key is consumed
@ -699,13 +707,20 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot
- (BOOL)_handleEnterWithState:(InputState *)state stateCallback:(void (^)(InputState *))stateCallback errorCallback:(void (^)(void))errorCallback - (BOOL)_handleEnterWithState:(InputState *)state stateCallback:(void (^)(InputState *))stateCallback errorCallback:(void (^)(void))errorCallback
{ {
if ([state isKindOfClass:[InputStateInputting class]]) { if ([state isKindOfClass:[InputStateInputting class]]) {
if (_inputMode == kPlainBopomofoModeIdentifier) {
if (!_bpmfReadingBuffer->isEmpty()) {
errorCallback();
}
return YES;
}
[self clear]; [self clear];
InputStateInputting *current = (InputStateInputting *) state; InputStateInputting *current = (InputStateInputting *) state;
NSString *composingBuffer = current.composingBuffer; NSString *composingBuffer = current.composingBuffer;
InputStateCommitting *committing = [[InputStateCommitting alloc] initWithPoppedText:composingBuffer]; InputStateCommitting *committing = [[InputStateCommitting alloc] initWithPoppedText:composingBuffer];
stateCallback(committing); stateCallback(committing);
InputState *empty = [[InputState alloc] init]; InputStateEmpty *empty = [[InputStateEmpty alloc] init];
stateCallback(empty); stateCallback(empty);
return YES; return YES;
} }
@ -991,7 +1006,8 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot
if (candidateIndex != NSUIntegerMax) { if (candidateIndex != NSUIntegerMax) {
[self.delegate keyHandler:self didSelectCandidateAtIndex:candidateIndex candidateController:gCurrentCandidateController]; [self.delegate keyHandler:self didSelectCandidateAtIndex:candidateIndex candidateController:gCurrentCandidateController];
[self clear]; [self clear];
InputStateEmpty *empty = [[InputStateEmpty alloc] init]; InputStateEmptyIgnoringPreviousState *empty = [[InputStateEmptyIgnoringPreviousState alloc] init];
stateCallback(empty);
[self handleInput:input state:empty stateCallback:stateCallback candidateSelectionCallback:candidateSelectionCallback errorCallback:errorCallback]; [self handleInput:input state:empty stateCallback:stateCallback candidateSelectionCallback:candidateSelectionCallback errorCallback:errorCallback];
} }
return YES; return YES;