adopt RimeApi_stdbool

LEOYoon-Tsaw · May 18, 2024 · ac09456 · ac09456
1 parent dbf147c
commit ac09456
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ $(RIME_DEPS):
 	$(MAKE) -C librime deps
 
 librime: $(RIME_DEPS)
-	$(MAKE) -C librime CFLAGS="-DSTDBOOL" CXXFLAGS="-DSTDBOOL" release install
+	$(MAKE) -C librime release install
 	$(MAKE) copy-rime-binaries
 
 copy-rime-binaries:

diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj
@@ -592,7 +592,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.99.5;
+				CURRENT_PROJECT_VERSION = 0.99.6;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -619,14 +619,12 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				OTHER_CFLAGS = "-DSTDBOOL";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DLEOPARD",
 					"-DHAVE_CONFIG_H",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
-					"-DSTDBOOL",
 				);
 				OTHER_LDFLAGS = "-lrime.1";
 				PRODUCT_BUNDLE_IDENTIFIER = im.rime.inputmethod.Squirrel;
@@ -648,7 +646,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.99.5;
+				CURRENT_PROJECT_VERSION = 0.99.6;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -674,14 +672,12 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				OTHER_CFLAGS = "-DSTDBOOL";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DLEOPARD",
 					"-DHAVE_CONFIG_H",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
-					"-DSTDBOOL",
 				);
 				OTHER_LDFLAGS = "-lrime.1";
 				PRODUCT_BUNDLE_IDENTIFIER = im.rime.inputmethod.Squirrel;

diff --git a/librime b/librime
diff --git a/sources/BridgingFunctions.swift b/sources/BridgingFunctions.swift
@@ -11,10 +11,10 @@ protocol DataSizeable {
     var data_size: Int32 { get set }
 }
 
-extension RimeContext: DataSizeable {}
+extension RimeContext_stdbool: DataSizeable {}
 extension RimeTraits: DataSizeable {}
 extension RimeCommit: DataSizeable {}
-extension RimeStatus: DataSizeable {}
+extension RimeStatus_stdbool: DataSizeable {}
 extension RimeModule: DataSizeable {}
 
 extension DataSizeable {

diff --git a/sources/Squirrel-Bridging-Header.h b/sources/Squirrel-Bridging-Header.h
@@ -3,7 +3,5 @@
 //  expose to Swift.
 //
 
-#define STDBOOL
-
-#import <rime_api.h>
+#import <rime_api_stdbool.h>
 #import <rime/key_table.h>
diff --git a/sources/SquirrelApplicationDelegate.swift b/sources/SquirrelApplicationDelegate.swift
@@ -14,7 +14,7 @@ final class SquirrelApplicationDelegate: NSObject, NSApplicationDelegate, SPUSta
   static let updateNotificationIdentifier = "SquirrelUpdateNotification"
   static let notificationIdentifier = "SquirrelNotification"
 
-  let rimeAPI: RimeApi = rime_get_api().pointee
+  let rimeAPI: RimeApi_stdbool = rime_get_api_stdbool().pointee
   var config: SquirrelConfig?
   var panel: SquirrelPanel?
   var enableNotifications = false

diff --git a/sources/SquirrelConfig.swift b/sources/SquirrelConfig.swift
@@ -8,7 +8,7 @@
 import AppKit
 
 final class SquirrelConfig {
-  private let rimeAPI = rime_get_api().pointee
+  private let rimeAPI: RimeApi_stdbool = rime_get_api_stdbool().pointee
   private(set) var isOpen = false
   var schemaID: String = ""
 

diff --git a/sources/SquirrelInputController.swift b/sources/SquirrelInputController.swift
@@ -11,7 +11,7 @@ final class SquirrelInputController: IMKInputController {
   private static let keyRollOver = 50
 
   private var client: IMKTextInput?
-  private let rimeAPI: RimeApi = rime_get_api().pointee
+  private let rimeAPI: RimeApi_stdbool = rime_get_api_stdbool().pointee
   private var preedit: String = ""
   private var selRange: NSRange = NSMakeRange(NSNotFound, 0)
   private var caretPos: Int = 0
@@ -408,7 +408,7 @@ private extension SquirrelInputController {
     // print("[DEBUG] rimeUpdate")
     rimeConsumeCommittedText()
 
-    var status = RimeStatus.rimeStructInit()
+    var status = RimeStatus_stdbool.rimeStructInit()
     if rimeAPI.get_status(session, &status) {
       // enable schema specific ui style
       if let schema_id = status.schema_id, schemaId == "" || schemaId != String(cString: schema_id) {
@@ -425,7 +425,7 @@ private extension SquirrelInputController {
       _ = rimeAPI.free_status(&status)
     }
 
-    var ctx = RimeContext.rimeStructInit()
+    var ctx = RimeContext_stdbool.rimeStructInit()
     if rimeAPI.get_context(session, &ctx) {
       // update preedit text
       let preedit = ctx.composition.preedit.map({ String(cString: $0) }) ?? ""
+1 −0		CMakeLists.txt
+4 −4		src/rime/algo/encoder.cc
+2 −2		src/rime/dict/dict_compiler.cc
+2 −2		src/rime/dict/entry_collector.cc
+278 −0		src/rime/lever/levers_api_impl.h
+3 −279		src/rime/lever/levers_module.cc
+11 −0		src/rime/lever/levers_stdbool.cc
+8 −12		src/rime/setup.cc
+6 −1,202		src/rime_api.cc
+34 −210		src/rime_api.h
+219 −0		src/rime_api_deprecated.h
+1,230 −0		src/rime_api_impl.h
+4 −0		src/rime_api_stdbool.cc
+22 −0		src/rime_api_stdbool.h
+2 −2		src/rime_levers_api.h