Merge pull request #193 from azooKey/feat/support_kana_input

ensan-hcl · web-flow · commit 6b89052d7188 · 2025-08-24T17:38:58.000+09:00
feat: かな入力をサポート
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", branch: "ee14c15ae9970c74a7a958aece64593ff1988141", traits: ["Zenzai"])
+        .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", branch: "5fe1f79ab7dec6dfba02d8c7c084523eb036fef9", traits: ["Zenzai"])
     ],
     targets: [
         .executableTarget(
@@ -31,13 +31,15 @@ let package = Package(
                 .product(name: "SwiftUtils", package: "AzooKeyKanaKanjiConverter"),
                 .product(name: "KanaKanjiConverterModuleWithDefaultDictionary", package: "AzooKeyKanaKanjiConverter")
             ],
+            swiftSettings: [.interoperabilityMode(.Cxx)],
             plugins: [
                 .plugin(name: "GitInfoPlugin")
             ]
         ),
         .testTarget(
             name: "CoreTests",
-            dependencies: ["Core"]
+            dependencies: ["Core"],
+            swiftSettings: [.interoperabilityMode(.Cxx)]
         )
     ]
 )
diff --git a/Core/Sources/Core/InputUtils/Actions/ClientAction.swift b/Core/Sources/Core/InputUtils/Actions/ClientAction.swift
@@ -1,11 +1,13 @@
 import InputMethodKit
+import KanaKanjiConverterModule
 
 public enum ClientAction {
     case `consume`
     case `fallthrough`
     case showCandidateWindow
     case hideCandidateWindow
     case appendToMarkedText(String)
+    case appendPieceToMarkedText(InputPiece)
 
     /// Marked Textを経由せずにインサートするコマンド。InputStateがnoneの場合のみ有効
     case insertWithoutMarkedText(String)
@@ -30,11 +32,7 @@ public enum ClientAction {
 
     /// MarkedTextを確定して、さらに追加で入力する
     case commitMarkedTextAndAppendToMarkedText(String)
-
-    /// 現在選ばれている候補を確定して、さらに追加で入力する
-    ///  - note:`commitMarkedTextAndAppendToMarkedText`はMarkedText全体を一度に確定するが、`submitSelectedCandidateAndAppendToMarkedText`の場合は部分的に確定されることがあるという違いがある
-    case submitSelectedCandidateAndAppendToMarkedText(String)
-    case submitSelectedCandidateAndEnterFirstCandidatePreviewMode
+    case commitMarkedTextAndAppendPieceToMarkedText(InputPiece)
 
     /// デバッグウィンドウを表示するコマンド
     case enableDebugWindow
diff --git a/Core/Sources/Core/InputUtils/Actions/UserAction.swift b/Core/Sources/Core/InputUtils/Actions/UserAction.swift
@@ -1,3 +1,4 @@
+import KanaKanjiConverterModule
 public enum UserAction {
     case input(String)
     case backspace
@@ -26,7 +27,7 @@ public enum UserAction {
     }
 
     public enum Number: Sendable, Equatable, Hashable {
-        case one, two, three, four, five, six, seven, eight, nine, zero
+        case one, two, three, four, five, six, seven, eight, nine, zero, shiftZero
         public var intValue: Int {
             switch self {
             case .one: 1
@@ -39,6 +40,23 @@ public enum UserAction {
             case .eight: 8
             case .nine: 9
             case .zero: 0
+            case .shiftZero: 0
+            }
+        }
+
+        public var inputPiece: InputPiece {
+            switch self {
+            case .one: .character("1")
+            case .two: .character("2")
+            case .three: .character("3")
+            case .four: .character("4")
+            case .five: .character("5")
+            case .six: .character("6")
+            case .seven: .character("7")
+            case .eight: .character("8")
+            case .nine: .character("9")
+            case .zero: .character("0")
+            case .shiftZero: .key(intention: "0", modifiers: [.shift])
             }
         }
 
@@ -54,6 +72,7 @@ public enum UserAction {
             case .eight: "8"
             case .nine: "9"
             case .zero: "0"
+            case .shiftZero: "0"
             }
         }
     }
diff --git a/Core/Sources/Core/InputUtils/InputState.swift b/Core/Sources/Core/InputUtils/InputState.swift
@@ -73,7 +73,7 @@ public enum InputState: Sendable, Hashable {
             case .number(let number):
                 switch inputLanguage {
                 case .japanese:
-                    return (.appendToMarkedText(number.inputString), .transition(.composing))
+                    return (.appendPieceToMarkedText(number.inputPiece), .transition(.composing))
                 case .english:
                     return (.insertWithoutMarkedText(number.inputString), .fallthrough)
                 }
@@ -124,7 +124,7 @@ public enum InputState: Sendable, Hashable {
             case .input(let string):
                 return (.appendToMarkedText(string), .fallthrough)
             case .number(let number):
-                return (.appendToMarkedText(number.inputString), .fallthrough)
+                return (.appendPieceToMarkedText(number.inputPiece), .fallthrough)
             case .backspace:
                 return (.removeLastMarkedText, .basedOnBackspace(ifIsEmpty: .none, ifIsNotEmpty: .composing))
             case .enter:
@@ -181,7 +181,7 @@ public enum InputState: Sendable, Hashable {
             case .input(let string):
                 return (.commitMarkedTextAndAppendToMarkedText(string), .transition(.composing))
             case .number(let number):
-                return (.appendToMarkedText(number.inputString), .transition(.composing))
+                return (.commitMarkedTextAndAppendPieceToMarkedText(number.inputPiece), .transition(.composing))
             case .backspace:
                 return (.removeLastMarkedText, .transition(.composing))
             case .enter:
@@ -282,8 +282,8 @@ public enum InputState: Sendable, Hashable {
                 switch num {
                 case .one, .two, .three, .four, .five, .six, .seven, .eight, .nine:
                     return (.selectNumberCandidate(num.intValue), .basedOnSubmitCandidate(ifIsEmpty: .none, ifIsNotEmpty: .previewing))
-                case .zero:
-                    return (.submitSelectedCandidateAndAppendToMarkedText(num.inputString), .transition(.composing))
+                case .zero, .shiftZero:
+                    return (.commitMarkedTextAndAppendPieceToMarkedText(num.inputPiece), .transition(.composing))
                 }
             case .editSegment(let count):
                 return (.editSegment(count), .transition(.selecting))
diff --git a/Core/Sources/Core/KeyMap/KeyMap+hankaku2zenkaku.swift b/Core/Sources/Core/KeyMap/KeyMap+hankaku2zenkaku.swift
@@ -12,6 +12,7 @@ extension KeyMap {
         "!": "！",
         "\"": "”",
         "#": "＃",
+        "$": "＄",
         "%": "％",
         "&": "＆",
         "'": "’",
diff --git a/azooKeyMac/Configs/CustomCodableConfigItem.swift b/azooKeyMac/Configs/CustomCodableConfigItem.swift
@@ -149,6 +149,8 @@ extension Config {
         enum Value: String, Codable, Equatable, Hashable {
             case `default`
             case defaultAZIK
+            case defaultKanaJIS
+            case defaultKanaUS
         }
         static var `default`: Value = .default
         static var key: String = "dev.ensan.inputmethod.azooKeyMac.preference.input_style"
diff --git a/azooKeyMac/InputController/SegmentsManager.swift b/azooKeyMac/InputController/SegmentsManager.swift
@@ -218,6 +218,15 @@ final class SegmentsManager {
         self.updateRawCandidate()
     }
 
+    @MainActor
+    func insertAtCursorPosition(piece: InputPiece, inputStyle: InputStyle) {
+        self.composingText.insertAtCursorPosition([.init(piece: piece, inputStyle: inputStyle)])
+        self.lastOperation = .insert
+        // ライブ変換がオフの場合は変換候補ウィンドウを出したい
+        self.shouldShowCandidateWindow = !self.liveConversionEnabled
+        self.updateRawCandidate()
+    }
+
     @MainActor
     func editSegment(count: Int) {
         // 現在選ばれているprefix candidateが存在する場合、まずそれに合わせてカーソルを移動する
@@ -508,6 +517,7 @@ final class SegmentsManager {
             switch $0.piece {
             case .compositionSeparator: nil
             case .character(let c): c
+            case .key(intention: let c, modifiers: _): c
             }
         })
         let candidateText = transform(inputString)
diff --git a/azooKeyMac/InputController/UserAction+getUserAction.swift b/azooKeyMac/InputController/UserAction+getUserAction.swift
@@ -236,6 +236,9 @@ extension UserAction {
                     29: .zero
                 ][event.keyCode]!
                 return .number(number)
+            } else if event.keyCode == 29 && event.modifierFlags.contains(.shift) && event.characters == "0" {
+                // JISキーボードにおいてShift+0の場合は特別な処理になる
+                return .number(.shiftZero)
             } else {
                 // go default
                 fallthrough
diff --git a/azooKeyMac/InputController/azooKeyMacInputController.swift b/azooKeyMac/InputController/azooKeyMacInputController.swift
@@ -204,6 +204,10 @@ class azooKeyMacInputController: IMKInputController { // swiftlint:disable:this
             .roman2kana
         case .defaultAZIK:
             .mapped(id: .defaultAZIK)
+        case .defaultKanaUS:
+            .mapped(id: .defaultKanaUS)
+        case .defaultKanaJIS:
+            .mapped(id: .defaultKanaJIS)
         }
     }
 
@@ -224,6 +228,8 @@ class azooKeyMacInputController: IMKInputController { // swiftlint:disable:this
             self.segmentsManager.update(requestRichCandidates: true)
         case .appendToMarkedText(let string):
             self.segmentsManager.insertAtCursorPosition(string, inputStyle: self.inputStyle)
+        case .appendPieceToMarkedText(let piece):
+            self.segmentsManager.insertAtCursorPosition(piece: piece, inputStyle: self.inputStyle)
         case .insertWithoutMarkedText(let string):
             client.insertText(string, replacementRange: NSRange(location: NSNotFound, length: 0))
         case .editSegment(let count):
@@ -235,14 +241,12 @@ class azooKeyMacInputController: IMKInputController { // swiftlint:disable:this
             let text = self.segmentsManager.commitMarkedText(inputState: self.inputState)
             client.insertText(text, replacementRange: NSRange(location: NSNotFound, length: 0))
             self.segmentsManager.insertAtCursorPosition(string, inputStyle: self.inputStyle)
+        case .commitMarkedTextAndAppendPieceToMarkedText(let piece):
+            let text = self.segmentsManager.commitMarkedText(inputState: self.inputState)
+            client.insertText(text, replacementRange: NSRange(location: NSNotFound, length: 0))
+            self.segmentsManager.insertAtCursorPosition(piece: piece, inputStyle: self.inputStyle)
         case .submitSelectedCandidate:
             self.submitSelectedCandidate()
-        case .submitSelectedCandidateAndAppendToMarkedText(let string):
-            self.submitSelectedCandidate()
-            self.segmentsManager.insertAtCursorPosition(string, inputStyle: self.inputStyle)
-        case .submitSelectedCandidateAndEnterFirstCandidatePreviewMode:
-            self.submitSelectedCandidate()
-            self.segmentsManager.requestSetCandidateWindowState(visible: false)
         case .removeLastMarkedText:
             self.segmentsManager.deleteBackwardFromCursorPosition()
             self.segmentsManager.requestResettingSelection()
diff --git a/azooKeyMac/Windows/ConfigWindow.swift b/azooKeyMac/Windows/ConfigWindow.swift
@@ -167,6 +167,8 @@ struct ConfigWindow: View {
                     Divider()
                     Picker("入力方式", selection: $inputStyle) {
                         Text("デフォルト").tag(Config.InputStyle.Value.default)
+                        Text("かな入力（JIS）").tag(Config.InputStyle.Value.defaultKanaJIS)
+                        Text("かな入力（US）").tag(Config.InputStyle.Value.defaultKanaUS)
                         Text("AZIK（β版）").tag(Config.InputStyle.Value.defaultAZIK)
                     }
                     Divider()

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ let package = Package(`
`14`	`14`	`)`
`15`	`15`	`],`
`16`	`16`	`dependencies: [`
`17`		`- .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", branch: "ee14c15ae9970c74a7a958aece64593ff1988141", traits: ["Zenzai"])`
	`17`	`+ .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", branch: "5fe1f79ab7dec6dfba02d8c7c084523eb036fef9", traits: ["Zenzai"])`
`18`	`18`	`],`
`19`	`19`	`targets: [`
`20`	`20`	`.executableTarget(`
`@@ -31,13 +31,15 @@ let package = Package(`
`31`	`31`	`.product(name: "SwiftUtils", package: "AzooKeyKanaKanjiConverter"),`
`32`	`32`	`.product(name: "KanaKanjiConverterModuleWithDefaultDictionary", package: "AzooKeyKanaKanjiConverter")`
`33`	`33`	`],`
	`34`	`+ swiftSettings: [.interoperabilityMode(.Cxx)],`
`34`	`35`	`plugins: [`
`35`	`36`	`.plugin(name: "GitInfoPlugin")`
`36`	`37`	`]`
`37`	`38`	`),`
`38`	`39`	`.testTarget(`
`39`	`40`	`name: "CoreTests",`
`40`		`- dependencies: ["Core"]`
	`41`	`+ dependencies: ["Core"],`
	`42`	`+ swiftSettings: [.interoperabilityMode(.Cxx)]`
`41`	`43`	`)`
`42`	`44`	`]`
`43`	`45`	`)`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,8 @@ extension Config {`
`149`	`149`	`enum Value: String, Codable, Equatable, Hashable {`
`150`	`150`	case `default`
`151`	`151`	`case defaultAZIK`
	`152`	`+ case defaultKanaJIS`
	`153`	`+ case defaultKanaUS`
`152`	`154`	`}`
`153`	`155`	static var `default`: Value = .default
`154`	`156`	`static var key: String = "dev.ensan.inputmethod.azooKeyMac.preference.input_style"`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,8 @@ struct ConfigWindow: View {`
`167`	`167`	`Divider()`
`168`	`168`	`Picker("入力方式", selection: $inputStyle) {`
`169`	`169`	`Text("デフォルト").tag(Config.InputStyle.Value.default)`
	`170`	`+ Text("かな入力（JIS）").tag(Config.InputStyle.Value.defaultKanaJIS)`
	`171`	`+ Text("かな入力（US）").tag(Config.InputStyle.Value.defaultKanaUS)`
`170`	`172`	`Text("AZIK（β版）").tag(Config.InputStyle.Value.defaultAZIK)`
`171`	`173`	`}`
`172`	`174`	`Divider()`