Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ひらがなモードで文字未入力時はPageDnなどの特殊キーを無視する #314

Merged
merged 1 commit into from
Feb 22, 2025
+10 −5
Merged

ひらがなモードで文字未入力時はPageDnなどの特殊キーを無視する #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions macSKK/StateMachine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,11 @@ final class StateMachine {
guard let input = event.charactersIgnoringModifiers else {
return false
}
if !event.modifierFlags.contains(.control) && !event.modifierFlags.contains(.command) {
return handleNormalPrintable(input: input, action: action, specialState: specialState)
} else {
if event.modifierFlags.contains(.control) || event.modifierFlags.contains(.command) || event.modifierFlags.contains(.function) {
// 単語登録中や登録解除中はtrueを返してなにもしない
return state.specialState != nil
} else {
return handleNormalPrintable(input: input, action: action, specialState: specialState)
}
}

Expand Down
9 changes: 7 additions & 2 deletions macSKKTests/StateMachineTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,11 @@ final class StateMachineTests: XCTestCase {
wait(for: [expectation], timeout: 1.0)
}

@MainActor func testHandleNormalUpDown() {
@MainActor func testHandleNormalUpDownPagedown() {
let stateMachine = StateMachine(initialState: IMEState(inputMode: .hiragana))
XCTAssertFalse(stateMachine.handle(upKeyAction))
XCTAssertFalse(stateMachine.handle(downKeyAction))
XCTAssertFalse(stateMachine.handle(pagedownKeyAction))
}

@MainActor func testHandleNormalPrintableDirect() {
Expand Down Expand Up @@ -3304,7 +3305,7 @@ final class StateMachineTests: XCTestCase {
}
// Deleteを押した
var deleteAction: Action {
Action(keyBind: .delete, event: generateNSEvent(character: "\u{63272}", characterIgnoringModifiers: "\u{63272}", modifierFlags: .function), cursorPosition: .zero)
Action(keyBind: .delete, event: generateNSEvent(character: "\u{f728}", characterIgnoringModifiers: "\u{f728}", modifierFlags: .function), cursorPosition: .zero)
}
// 英数キーを押した
var eisuKeyAction: Action {
Expand All @@ -3314,6 +3315,10 @@ final class StateMachineTests: XCTestCase {
var kanaKeyAction: Action {
Action(keyBind: .kana, event: generateNSEvent(character: "\u{10}", characterIgnoringModifiers: "\u{10}"), cursorPosition: .zero)
}
// PageDownキーを押した
var pagedownKeyAction: Action {
Action(keyBind: nil, event: generateNSEvent(character: "\u{f72d}", characterIgnoringModifiers: "\u{f72d}", modifierFlags: .function), cursorPosition: .zero)
}

// NormalモードまたはSelectingモードでqキーを押した
var toggleKanaAction: Action {
Expand Down
Loading