Ticket #8300: cannaim.patch

src/add-ons/input_server/methods/canna/CannaInterface.cpp

@@ -593 +593 @@
                 && kouhoRevLine != -1)
             || current_mode == CANNA_MODE_TourokuDicMode
             || current_mode == CANNA_MODE_BushuMode) {
-            // remove first index
-            memmove(kouhoUTF, kouhoUTF + 2, kouhoUTFLen - 1);
+            // remove first index (3 bytes)
+            memmove(kouhoUTF, kouhoUTF + 3, kouhoUTFLen - 2);
 
-            // convert full-space to LF
+            // convert full width space and following 3 bytes index to LF
             while ((index = strstr(kouhoUTF, "\xe3\x80\x80")) != NULL) {
                 *index = '\x0a';
                 len = strlen(index);
-                memmove(index + 1, index + 5, len - 4);
+                memmove(index + 1, index + 6, len - 5);
             }
             kouhoUTFLen = strlen(kouhoUTF);
         }

src/add-ons/input_server/methods/canna/CannaLooper.cpp

@@ -109 +109 @@
 
     font_family family;
     font_style style;
-    strcpy(family, "Haru");
-    strcpy(style, "Regular");
+    strcpy(family, "VL PGothic");
+    strcpy(style, "regular");
 
     fKouhoFont.SetFamilyAndStyle(family, style);
     fKouhoFont.SetSize(12);

src/add-ons/input_server/methods/canna/KouhoWindow.cpp

@@ -33 +33 @@
 
     font_family family;
     font_style style;
-    strcpy( family, "Haru" );
-    strcpy( style, "Regular" );
+    strcpy( family, "VL PGothic" );
+    strcpy( style, "regular" );
     indexfont.SetFamilyAndStyle( family, style );
     indexfont.SetSize( 10 );
 
@@ -271 +271 @@
         highlightRect = region.RectAt( 0 );
         //extend highlihght region to right end
         highlightRect.right = Bounds().right;
-        Invalidate( highlightRect );
-
+        Invalidate();
     }
 
 }