AquaSKK

Fork

[aquaskk-changes 179] CVS update: AquaSKK

Tomotaka SUWA t-suw****@users*****
2006年 3月 29日 (水) 01:26:03 JST

• 前の記事 [aquaskk-changes 178] CVS update: AquaSKK/AquaSKK.pbproj
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: AquaSKK/BIMInputEvents.cpp
diff -u AquaSKK/BIMInputEvents.cpp:1.2.2.1 AquaSKK/BIMInputEvents.cpp:1.2.2.2
--- AquaSKK/BIMInputEvents.cpp:1.2.2.1	Sat Jan  7 16:22:28 2006
+++ AquaSKK/BIMInputEvents.cpp	Wed Mar 29 01:26:03 2006
@@ -1,5 +1,5 @@
 /*
-  $Id: BIMInputEvents.cpp,v 1.2.2.1 2006/01/07 07:22:28 t-suwa Exp $
+  $Id: BIMInputEvents.cpp,v 1.2.2.2 2006/03/28 16:26:03 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -154,46 +154,64 @@
 	}
     }
 
-    if(error == noErr) {
-        error = SetEventParameter(event, kEventParamTextInputSendUpdateRng,
-				  typeTextRangeArray, sizeof(short) + sizeof(TextRange) * 2,
-				  //typeTextRangeArray, sizeof( short ) + sizeof( TextRange ) * 1,
-				  updateRangePtr);
-    }
+    if(fixLength == 0) {
+	if(error == noErr) {
+	    error = SetEventParameter(event, kEventParamTextInputSendUpdateRng,
+				      typeTextRangeArray, sizeof(short) + sizeof(TextRange) * 2, updateRangePtr);
+	}
 
-    // ƒnƒCƒ‰ƒCƒg‚͈̔͂ƃLƒƒƒŒƒbƒg‚̈ʒu‚ðŽw’èB
-    if(error == noErr) {
-        hiliteRangePtr = (TextRangeArrayPtr)NewPtrClear(sizeof(short) + sizeof(TextRange) * 2);
-        if(hiliteRangePtr) {
-            hiliteRangePtr->fNumOfRanges = 2;
-            hiliteRangePtr->fRange[0].fStart = 0;
-            hiliteRangePtr->fRange[0].fEnd = (*inSessionHandle)->fInputBufferCount * sizeof( UniChar );
+	// ƒnƒCƒ‰ƒCƒg‚͈̔͂ƃLƒƒƒŒƒbƒg‚̈ʒu‚ðŽw’èB
+	if(error == noErr) {
+	    hiliteRangePtr = (TextRangeArrayPtr)NewPtrClear(sizeof(short) + sizeof(TextRange) * 2);
+	    if(hiliteRangePtr) {
+		hiliteRangePtr->fNumOfRanges = 2;
+		hiliteRangePtr->fRange[0].fStart = 0;
+		hiliteRangePtr->fRange[0].fEnd = (*inSessionHandle)->fInputBufferCount * sizeof(UniChar);
 #if MAC_OS_X_VERSION_MAX_ALLOWED>=1040
-            if (fixLength > 0)
-                hiliteRangePtr->fRange[0].fHiliteStyle = kTSMHiliteConvertedText;
-            else
                 hiliteRangePtr->fRange[0].fHiliteStyle = kTSMHiliteRawText;
-
-            hiliteRangePtr->fRange[1].fStart = caret_position;
-            hiliteRangePtr->fRange[1].fEnd = caret_position;
-            hiliteRangePtr->fRange[1].fHiliteStyle = kTSMHiliteCaretPosition;
+		hiliteRangePtr->fRange[1].fStart = caret_position;
+		hiliteRangePtr->fRange[1].fEnd = caret_position;
+		hiliteRangePtr->fRange[1].fHiliteStyle = kTSMHiliteCaretPosition;
 #else
-            if (fixLength > 0)
-                hiliteRangePtr->fRange[0].fHiliteStyle = kConvertedText;
-            else
                 hiliteRangePtr->fRange[0].fHiliteStyle = kRawText;
-			
-            hiliteRangePtr->fRange[1].fStart = caret_position;
-            hiliteRangePtr->fRange[1].fEnd = caret_position;
-            hiliteRangePtr->fRange[1].fHiliteStyle = kCaretPosition;
+		hiliteRangePtr->fRange[1].fStart = caret_position;
+		hiliteRangePtr->fRange[1].fEnd = caret_position;
+		hiliteRangePtr->fRange[1].fHiliteStyle = kCaretPosition;
 #endif
-        } else {
-            error = memFullErr;
+	    } else {
+		error = memFullErr;
+	    }
+	}
+	if(error == noErr) {
+	    error = SetEventParameter(event, kEventParamTextInputSendHiliteRng, typeTextRangeArray,
+				      sizeof(short) + sizeof(TextRange) * 2, hiliteRangePtr);
+	}
+    } else {
+	if(error == noErr) {
+	    error = SetEventParameter(event, kEventParamTextInputSendUpdateRng,
+				      typeTextRangeArray, sizeof(short) + sizeof(TextRange) * 1, updateRangePtr);
+	}
+
+	// ƒnƒCƒ‰ƒCƒg‚͈̔͂ƃLƒƒƒŒƒbƒg‚̈ʒu‚ðŽw’èB
+	if(error == noErr) {
+	    hiliteRangePtr = (TextRangeArrayPtr)NewPtrClear(sizeof(short) + sizeof(TextRange) * 1);
+	    if(hiliteRangePtr) {
+		hiliteRangePtr->fNumOfRanges = 1;
+		hiliteRangePtr->fRange[0].fStart = caret_position;
+		hiliteRangePtr->fRange[0].fEnd = caret_position;
+#if MAC_OS_X_VERSION_MAX_ALLOWED>=1040
+		hiliteRangePtr->fRange[0].fHiliteStyle = kTSMHiliteCaretPosition;
+#else
+		hiliteRangePtr->fRange[0].fHiliteStyle = kCaretPosition;
+#endif
+	    } else {
+		error = memFullErr;
+	    }
+	}
+	if(error == noErr) {
+	    error = SetEventParameter(event, kEventParamTextInputSendHiliteRng, typeTextRangeArray,
+				      sizeof(short) + sizeof(TextRange) * 1, hiliteRangePtr);
 	}
-    }
-    if(error == noErr) {
-        error = SetEventParameter(event, kEventParamTextInputSendHiliteRng, typeTextRangeArray,
-				  sizeof(short) + sizeof(TextRange) * 2, hiliteRangePtr);
     }
 
     pinRange.fStart = 0;
Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.20.2.18 AquaSKK/ChangeLog:1.20.2.19
--- AquaSKK/ChangeLog:1.20.2.18	Sun Mar 26 23:39:11 2006
+++ AquaSKK/ChangeLog	Wed Mar 29 01:26:03 2006
@@ -1,3 +1,8 @@
+2006-03-29  Taiichi HASHIMOTO  <taiic****@mac*****>
+
+	* BIMInputEvents.cpp: •ÏŠ·•¶Žš—ñ‚̃vƒƒpƒeƒB‚ð‚±‚Æ‚¦‚è‚Æ“¯‚¶‚É‚È‚é
+	‚悤‚ɏC³B
+
 2006-03-26  Tomotaka SUWA  <t.suw****@mac*****>
 
 	* CppScrap.*: íœB

• 前の記事 [aquaskk-changes 178] CVS update: AquaSKK/AquaSKK.pbproj
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]