fix: macOS에서의 한국어 ime

Author: heuguchon

indra/llwindow/llopenglview-objc.h

@@ -68,6 +68,7 @@
 - (unsigned long) getVramSize;
 
 - (void) allowMarkedTextInput:(bool)allowed;
+- (BOOL) isCJKCharacter:(unichar)character;
 - (void) viewDidEndLiveResize;
 
 @end

indra/llwindow/llopenglview-objc.mm

@@ -313,6 +313,12 @@ - (id) initWithFrame:(NSRect)frame withSamples:(NSUInteger)samples andVsync:(BOO
 
     mOldResize = false;
 
+    // CJK 입력 관련 변수 초기화 (한국어, 일본어, 중국어)
+    mHasMarkedText = FALSE;
+    mMarkedTextLength = 0;
+    mMarkedTextAllowed = true; // 기본값을 true로 설정하여 IME 지원
+    mSimulatedRightClick = false;
+    
 	return self;
 }
 
@@ -517,6 +523,23 @@ - (void) keyDown:(NSEvent *)theEvent
     {
         ch = [str_no_modifiers characterAtIndex:0];
     }
+    
+    // CJK 언어 조합 중인지 확인 (한국어, 일본어, 중국어)
+    BOOL isComposingCJK = mHasMarkedText || 
+                          (!mMarkedTextAllowed && 
+                           !(mModifiers & (NSControlKeyMask | NSCommandKeyMask)) &&
+                           ![(LLAppDelegate*)[NSApp delegate] romanScript] &&
+                           ch > ' ' &&
+                           ch != NSDeleteCharacter &&
+                           (ch < 0xF700 || ch > 0xF8FF));
+    
+    // CJK 조합 중이면 키 이벤트를 처리하지 않고 IME에 맡김
+    if (isComposingCJK && mHasMarkedText)
+    {
+        [[self inputContext] handleEvent:theEvent];
+        return;
+    }
+    
     bool acceptsText = mHasMarkedText ? false : callKeyDown(&eventData, keycode, mModifiers, ch);
 
     if (acceptsText &&
@@ -667,8 +690,17 @@ - (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replaceme
         };
 
         int string_length = [aString length];
+        
+        // 빈 문자열이면 marked text 제거
+        if (string_length == 0)
+        {
+            [self unmarkText];
+            return;
+        }
+        
         unichar text[string_length];
         attributedStringInfo segments;
+        
         // I used 'respondsToSelector:@selector(string)'
         // to judge aString is an attributed string or not.
         if ([aString respondsToSelector:@selector(string)])
@@ -684,18 +716,13 @@ - (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replaceme
             segments.seg_lengths.push_back(string_length);
             segments.seg_standouts.push_back(true);
         }
+        
         setMarkedText(text, selected, replacement, string_length, segments);
-        if (string_length > 0)
-        {
-            mHasMarkedText = TRUE;
-            mMarkedTextLength = string_length;
-        }
-        else
-        {
-            // we must clear the marked text when aString is null.
-            [self unmarkText];
-        }
-    } else {
+        mHasMarkedText = TRUE;
+        mMarkedTextLength = string_length;
+    } 
+    else 
+    {
         if (mHasMarkedText)
         {
             [self unmarkText];
@@ -743,10 +770,17 @@ - (void)insertText:(id)insertString
 
 - (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
 {
-	// SL-19801 Special workaround for system emoji picker
-	if ([aString length] == 2)
-	{
-        @try
+    @try
+    {
+        // marked text가 있는 경우 먼저 정리
+        if (mHasMarkedText)
+        {
+            resetPreedit();
+            mHasMarkedText = FALSE;
+        }
+        
+        // 이모지 처리 (기존 로직 유지)
+        if ([aString length] == 2)
         {
             uint32_t b0 = [aString characterAtIndex:0];
             uint32_t b1 = [aString characterAtIndex:1];
@@ -757,32 +791,23 @@ - (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
                 return;
             }
         }
-        @catch(NSException * e)
-        {
-            // One of the characters is an attribute string?
-            NSLog(@"Encountered an unsupported attributed character. Exception: %@ String: %@", e.name, aString);
-            return;
-        }
-	}
-    
-    @try
-    {
-        if (!mHasMarkedText)
+        
+        // 각 문자를 순차적으로 처리
+        for (NSInteger i = 0; i < [aString length]; i++)
         {
-            for (NSInteger i = 0; i < [aString length]; i++)
+            unichar character = [aString characterAtIndex:i];
+            
+            // CJK 문자인지 확인 (한국어, 일본어, 중국어)
+            if ([self isCJKCharacter:character])
             {
-                callUnicodeCallback([aString characterAtIndex:i], mModifiers);
+                // CJK 문자는 modifier 없이 전송
+                callUnicodeCallback(character, 0);
             }
-        } else {
-            resetPreedit();
-            // We may never get this point since unmarkText may be called before insertText ever gets called once we submit our text.
-            // But just in case...
-            
-            for (NSInteger i = 0; i < [aString length]; i++)
+            else
             {
-                handleUnicodeCharacter([aString characterAtIndex:i]);
+                // 기타 문자들
+                callUnicodeCallback(character, mModifiers);
             }
-            mHasMarkedText = FALSE;
         }
     }
     @catch(NSException * e)
@@ -831,6 +856,40 @@ - (BOOL)drawsVerticallyForCharacterAtIndex:(NSUInteger)charIndex
 - (void) allowMarkedTextInput:(bool)allowed
 {
     mMarkedTextAllowed = allowed;
+    
+    // CJK 입력 모드에서는 강제로 허용
+    if (![(LLAppDelegate*)[NSApp delegate] romanScript])
+    {
+        mMarkedTextAllowed = true;
+    }
+}
+
+// CJK 문자 판별 헬퍼 메서드
+- (BOOL)isCJKCharacter:(unichar)character
+{
+    // 한국어: 한글 (가-힐힣)
+    if (character >= 0xAC00 && character <= 0xD7AF) return YES;
+    
+    // 일본어: 히라가나
+    if (character >= 0x3040 && character <= 0x309F) return YES;
+    
+    // 일본어: 가타기나  
+    if (character >= 0x30A0 && character <= 0x30FF) return YES;
+    
+    // 일본어: 반각 가타기나
+    if (character >= 0xFF65 && character <= 0xFF9F) return YES;
+    
+    // 중국어/일본어: CJK 통합 한자
+    if (character >= 0x4E00 && character <= 0x9FFF) return YES;
+    
+    // 중국어: CJK 확장 A
+    if (character >= 0x3400 && character <= 0x4DBF) return YES;
+    
+    // 한국어: 한글 자모 (호환용)
+    if (character >= 0x1100 && character <= 0x11FF) return YES; // 한글 자모
+    if (character >= 0x3130 && character <= 0x318F) return YES; // 한글 호환 자모
+    
+    return NO;
 }
 
 @end