Preserve original string for system keyboard

gureum · Nov 23, 2019 · 6d2bcd3 · 6d2bcd3
1 parent 4347978
commit 6d2bcd3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/OSXCore/HangulComposer.swift b/OSXCore/HangulComposer.swift
@@ -201,10 +201,10 @@ final class HangulComposer: NSObject, Composer {
 
         var string = string!
         // 한글 입력에서 캡스락 무시
-        if flags.contains(.capsLock) {
+        if flags.contains(.shift) {
-            if !flags.contains(.shift) {
+            string = KeyMapUpper[keyCode.rawValue] ?? string
-                string = string.lowercased()
+        } else {
-            }
+            string = KeyMapLower[keyCode.rawValue] ?? string
         }
         let handled = inputContext.process(string.unicodeScalars.first!.value)
         let ucsString = inputContext.commitUCSString

diff --git a/OSXCore/InputReceiver.swift b/OSXCore/InputReceiver.swift
@@ -49,14 +49,6 @@ public class InputReceiver: InputTextDelegate {
             default:
                 assert(false)
             }
-        } else {
-            if keyCode.isKeyMappable {
-                if flags.contains(.shift) {
-                    string = KeyMapUpper[keyCode.rawValue] ?? string
-                } else {
-                    string = KeyMapLower[keyCode.rawValue] ?? string
-                }
-            }
         }
 
         // 특정 애플리케이션에서 커맨드/옵션/컨트롤 키 입력을 선점하지 못하는 문제를 회피한다

diff --git a/OSXCore/RomanComposer.swift b/OSXCore/RomanComposer.swift
@@ -101,7 +101,12 @@ final class RomanComposer: Composer {
             return .notProcessed
         }
 
-        let character = string.first!
+        let character: Character
+        if flags.contains(.shift) {
+            character = KeyMapUpper[keyCode.rawValue]?.first ?? string.first!
+        } else {
+            character = KeyMapLower[keyCode.rawValue]?.first ?? string.first!
+        }
         let newCharacter: Character = {
             if flags.contains(.capsLock), character.isLowercaseCharacter {
                 return Character(UnicodeScalar(String(character).unicodeScalars.first!.value - 0x20)!)