Merge branch 'main' of https://github.com/DINKIssTyle/DINKIssTyle-IME-macOS

Author: DINKIssTyle

Sources/DKSTHangul.m

@@ -13,6 +13,20 @@ @interface DKSTHangul () {
     NSMutableString *_buffer;
     NSMutableString *_completed;
 }
+
+    // Old Hangul Choseongs
+    #define CHOSEONG_YESIEUNG       0x114C // Yesieung (ㆁ)
+    #define CHOSEONG_SSANGIEUNG     0x1147 // SsangIeung (ㆀ) - Shift+D
+    #define CHOSEONG_PANSIOT        0x1140 // Bansiot (ㅿ)
+    #define CHOSEONG_YEORINHIEUH    0x1159 // Yeorinhieuh (ㆆ)
+    #define CHOSEONG_KAPYEOUNPHIEUP 0x1157 // KapyeounPhieup (ㆄ)
+    #define CHOSEONG_SG             0x112D // Sios-Kiyeok (ㅺ)
+    #define CHOSEONG_BS             0x112F // Sios-Tikeut (ㅼ)
+    #define CHOSEONG_BJ             0x1132 // Sios-Pieup (ㅽ)
+    
+    // Old Hangul Jungseongs
+    #define JUNGSEONG_ARAEAE        0x11A1
+
 @end
 
 @implementation DKSTHangul
@@ -71,11 +85,18 @@ - (NSString *)commitString {
 }
 
 // Check types
-- (BOOL)isCho:(unichar)c { return c >= 0x1100 && c <= 0x1112; }
-- (BOOL)isJung:(unichar)c { return (c >= 0x1161 && c <= 0x1175) || (c == 0x119E); }
-- (BOOL)isJong:(unichar)c { return (c >= 0x11A8 && c <= 0x11C2); }
+// Updated ranges for Old Hangul
+- (BOOL)isCho:(unichar)c { return (c >= 0x1100 && c <= 0x115F); } // Expanded
+- (BOOL)isJung:(unichar)c { return (c >= 0x1161 && c <= 0x11A7); } // Expanded
+- (BOOL)isJong:(unichar)c { return (c >= 0x11A8 && c <= 0x11FF); } // Expanded
 
 - (unichar)mapFromChar:(unichar)c {
+    // Old Hangul Overrides for Shift+D/Shift+G
+    if (self.oldHangulEnabled) {
+        if (c == 'D') return CHOSEONG_SSANGIEUNG; // ㆀ
+        if (c == 'G') return CHOSEONG_KAPYEOUNPHIEUP; // ㆄ
+    }
+
     switch(c) {
         case 'q': return 0x1107; case 'Q': return 0x1108; // ㅂ, ㅃ
         case 'w': return 0x110c; case 'W': return 0x110d; // ㅈ, ㅉ
@@ -110,6 +131,28 @@ - (unichar)mapFromChar:(unichar)c {
     return 0;
 }
 
+- (unichar)combineCho:(unichar)a second:(unichar)b {
+    if (!self.oldHangulEnabled) return 0;
+    
+    // ㅇ + ㅇ = ㆁ (Yesieung)
+    if (a == 0x110B && b == 0x110B) return CHOSEONG_YESIEUNG;
+    // ㅅ + ㅅ = ㅿ (Bansiot)
+    if (a == 0x1109 && b == 0x1109) return CHOSEONG_PANSIOT;
+    // ㅎ + ㅎ = ㆆ (Yeorinhieuh)
+    if (a == 0x1112 && b == 0x1112) return CHOSEONG_YEORINHIEUH;
+    
+    // ㄱ + ㅅ = ㅺ (Sg)
+    if (a == 0x1100 && b == 0x1109) return CHOSEONG_SG;
+    // ㅂ + ㅅ = ㅼ (Bs)
+    if (a == 0x1107 && b == 0x1109) return CHOSEONG_BS;
+    // ㅂ + ㅈ = ㅽ (Bj)
+    if (a == 0x1107 && b == 0x110C) return CHOSEONG_BJ;
+    
+    return 0;
+}
+
+
+
 - (unichar)currentSyllable {
     if (_cho == 0 && _jung == 0 && _jong == 0) return 0;
 
@@ -248,9 +291,15 @@ - (BOOL)processCode:(NSInteger)keyCode modifiers:(NSUInteger)flags
              // State: Cho only or Empty
              if (_cho == 0) { _cho = hangul; }
              else { 
-                 // Flush prev Cho, start new
-                 [_completed appendFormat:@"%C", [self compatibilityJamo:_cho]];
-                 _cho = hangul;
+                 // Try Combine Cho (Old Hangul)
+                 unichar compound = [self combineCho:_cho second:hangul];
+                 if (compound) {
+                     _cho = compound;
+                 } else {
+                     // Flush prev Cho, start new
+                     [_completed appendFormat:@"%C", [self compatibilityJamo:_cho]];
+                     _cho = hangul;
+                 }
             }
         } else {
             // Already have Jung.
@@ -273,7 +322,10 @@ - (BOOL)processCode:(NSInteger)keyCode modifiers:(NSUInteger)flags
                 if (asJong) {
                     _jong = asJong;
                 } else {
-                    // Start new syllable
+                    // Not a valid Jongseong. Maybe combined Cho (Old Hangul)?
+                    // But we already have Jung, so it's a new Syllable unless Old Hangul allows Cho+Jung+Cho?
+                    // No, Cho+Jung+Cho structure isn't standard. It must be Jongseong or new Syllable.
+                    // If it's not a valid Jongseong, it's a new syllable.
                     [self flush];
                     _cho = hangul; _jung = 0; _jong = 0;
                 }

Sources/InputController.m

@@ -142,6 +142,13 @@ - (BOOL)handleEvent:(NSEvent *)event client:(id)sender {
             default: break;
         }
 
+        // Old Hangul Bypass for 'd' (ㅇ) and 'g' (ㅎ)
+        // If Old Hangul is enabled, Shift+D and Shift+G should bypass usage of custom phrase
+        BOOL oldHangul = [[NSUserDefaults standardUserDefaults] boolForKey:@"EnableOldHangul"];
+        if (oldHangul && (keyCode == 2 || keyCode == 5)) {
+             lookupKey = nil; // Skip map lookup
+        }
+        
         if (lookupKey) {
             NSDictionary *mappings = [defaults dictionaryForKey:@"DKSTCustomShiftMappings"];
             NSString *output = [mappings objectForKey:lookupKey];

v2.md

@@ -7,18 +7,14 @@ The Preferences window has been completely redesigned for better usability and c
 
 - **Reorganized Layout**: Settings are now grouped logically.
     1. **Caps Lock Switch**: Use Caps Lock to toggle input mode.
-    2. **Menu Bar Icon**: Select between **Taegeuk** (Default) and **Hangul** icons.
-        *   **Taegeuk**: Traditional Taegeuk shape (`Hangul.pdf` or `Hangul.tiff`).
-        *   **Hangul**: "한" character (`Hangul_2.pdf`).
-    3. **Moa-chigi**: Enable vowel+consonant combination.
-    4. **Old Hangul**: Enable archaic script support (e.g., Araea).
-    5. **Delete by**: Choose between **Jaso** (Unit) and **Gulja** (Syllable) deletion.
-    6. **Custom Shift Shortcuts**: Enable emoji/text shortcuts.
-    7. **Mapping Table**: Defines the custom shortcuts.
+    2. **Moa-chigi**: Enable vowel+consonant combination.
+    3. **Old Hangul**: Enable archaic script support (e.g., Araea, Old Choseong).
+        *   Supported: `ㅏㅣ`(`ㆎ`), `ㅇㅇ`(`ㆁ`), `ㅎ`(`ㆆ`) etc.
+    4. **Delete by**: Choose between **Jaso** (Unit) and **Gulja** (Syllable) deletion.
+    5. **Custom Shift Shortcuts**: Enable emoji/text shortcuts.
+    6. **Mapping Table**: Defines the custom shortcuts.
 - **Visual Improvements**:
-    - **Preferences Window**:
-        - Increased label widths to prevent truncation ("Menu bar icon...").
-        - Aligned radio buttons for a cleaner layout.
+    - **UI Cleanup**: Removed unused icon selection options and optimized vertical spacing.
     - Added a copyright label "(C) 2025 DINKI'ssTyle".
     - Updated default settings:
         *   **Enable Moa-chigi**: ON
@@ -30,23 +26,27 @@ The Preferences window has been completely redesigned for better usability and c
 ## 2. Engine Improvements (DKSTHangul)
 - **Archaic Syllable Support**:
     - Implemented logic to support archaic combinations like "ㅎㆍᆫ".
+    - **New Combinations**:
+        - `ㅇㅇ` -> `ㆁ` (Yesieung)
+        - `ㅅㅅ` -> `ㅿ` (Bansiot)
+        - `ㅎㅎ` -> `ㆆ` (Yeorinhieuh)
+        - `ㄱㅅ` -> `ㅺ`, `ㅂㅅ` -> `ㅼ`, `ㅂㅈ` -> `ㅽ`
+        - `ㅏㅣ` -> `ㆎ` (Araea-I)
+        - `Shift+D` -> `ㆀ` (SsangIeung), `Shift+G` -> `ㆄ` (KapyeounPhieup)
     - Switched to using **Conjoining Jamo (U+11xx)** for archaic syllables instead of Compatibility Jamo, ensuring proper rendering by the OS font engine.
-    - Fixed a crash issue where invalid combinations were appending null characters.
 - **Araea Input**:
     - Typing 'ㅏ' (k) + 'ㅏ' (k) now produces Araea ('ᆞ') if "Using old Korean script" is enabled.
-- **Moa-chigi**:
-    - Logic preserved and integrated with new settings.
 
 ## 3. System & Build
+- **Installation Fix**:
+    - Updated `install.command` to install the Input Method to the User Library (`~/Library/Input Methods`) instead of the System Library. This resolves permission issues with `Info.plist` modifications and simplifies the install process (no sudo required for install).
 - **API Modernization**:
     - Replaced the deprecated `launchApplication:` method with `openApplicationAtURL:`.
     - Replaced deprecated `absolutePathForAppBundleWithIdentifier:` with `URLForApplicationWithBundleIdentifier:` in Preferences.
 - **Icon Support**:
-    - **Dynamic Icon Switching**: Implemented logic to modify `Info.plist` at runtime to switch between icon files based on user preference.
-    - **TIFF Conversion**: Converted `Hangul.png` to `Hangul.tiff` to potentially resolve tinting issues (though PDF is primarily used now).
-    - Added support for PNG/TIFF resource copying in [build.sh](file:///Users/dinki/Documents/GitHub/DINKIssTyle-IME-macOS/build.sh).
+    - Reverted to static `Hangul.pdf` (Taegeuk) icon as the single standard icon.
 
 ## Usage
 1. Run [./build.sh](file:///Users/dinki/Documents/GitHub/DINKIssTyle-IME-macOS/build.sh) to compile.
-2. Run [./install.command](file:///Users/dinki/Documents/GitHub/DINKIssTyle-IME-macOS/install.command) to install.
-3. Logout and login (or restart) to apply icon changes and ensure the input method is fully reloaded.
+2. Run [./install.command](file:///Users/dinki/Documents/GitHub/DINKIssTyle-IME-macOS/install.command) to install (Select Option 1).
+3. Logout and login (or restart) to ensure the input method is fully reloaded.