Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to rime_get_api #1401

Merged
merged 4 commits into from
Jun 15, 2024
Merged

Migrate to rime_get_api #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adb63c6
chore: migrate to rime_get_api
Bambooin Jun 14, 2024
9d39427
chore: upgrade librime lua with rime_get_api
Bambooin Jun 14, 2024
a114bd7
chore: upgrade librime with rime_get_api
Bambooin Jun 14, 2024
d0f1787
chore: add .kotlin to git ignore
Bambooin Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,3 +477,6 @@ app/src/main/assets/checksums.json
app/boost-*.tar.xz
app/src/main/jni/boost/

# kotlin
.kotlin

2 changes: 1 addition & 1 deletion app/src/main/jni/librime
Open in desktop
Submodule librime updated 26 files
+2 −0 .gitignore
+11 −0 CHANGELOG.md
+2 −1 CMakeLists.txt
+1 −1 package.json
+4 −4 src/rime/algo/encoder.cc
+3 −2 src/rime/composition.cc
+3 −5 src/rime/context.cc
+2 −2 src/rime/dict/dict_compiler.cc
+2 −2 src/rime/dict/entry_collector.cc
+12 −2 src/rime/gear/switch_translator.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
+3 −2 src/rime/module.cc
+8 −12 src/rime/setup.cc
+2 −0 src/rime/switches.h
+5 −1,202 src/rime_api.cc
+35 −206 src/rime_api.h
+219 −0 src/rime_api_deprecated.h
+1,232 −0 src/rime_api_impl.h
+3 −0 src/rime_api_stdbool.cc
+22 −0 src/rime_api_stdbool.h
+2 −2 src/rime_levers_api.h
+42 −0 test/flavored_api_test.cc
+2 −0 test/rime_test_main.cc
+3 −0 tools/rime_api_console.cc
2 changes: 1 addition & 1 deletion app/src/main/jni/librime-lua
Open in desktop
Submodule librime-lua updated 6 files
+7 −2 sample/lua/script_translator.lua
+7 −2 sample/lua/table_translator.lua
+29 −9 src/script_translator.cc
+31 −9 src/table_translator.cc
+27 −8 src/translator.h
+45 −19 src/types.cc
2 changes: 1 addition & 1 deletion app/src/main/jni/librime_jni/objconv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ inline jobject rimeConfigListToJObject(JNIEnv *env, RimeConfig *config,
auto obj =
env->NewObject(GlobalRef->ArrayList, GlobalRef->ArrayListInit, size);
int i = 0;
while (RimeConfigNext(&iter)) {
while (rime->config_next(&iter)) {
auto e = JRef<>(env, rimeConfigValueToJObject(env, config, iter.path));
env->CallVoidMethod(obj, GlobalRef->ArrayListAdd, i++, *e);
}
Expand Down
22 changes: 12 additions & 10 deletions app/src/main/jni/librime_jni/rime_jni.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,24 +275,25 @@ Java_com_osfans_trime_core_Rime_getRimeStatus(JNIEnv *env, jclass /* thiz */) {
}

static bool is_save_option(const char *p) {
auto rime = rime_get_api();
bool is_save = false;
std::string option_name(p);
if (option_name.empty()) return is_save;
RimeConfig config = {nullptr};
bool b = RimeConfigOpen("default", &config);
bool b = rime->config_open("default", &config);
if (!b) return is_save;
const char *key = "switcher/save_options";
RimeConfigIterator iter = {nullptr};
RimeConfigBeginList(&iter, &config, key);
while (RimeConfigNext(&iter)) {
std::string item(RimeConfigGetCString(&config, iter.path));
rime->config_begin_list(&iter, &config, key);
while (rime->config_next(&iter)) {
std::string item(rime->config_get_cstring(&config, iter.path));
if (option_name == item) {
is_save = true;
break;
}
}
RimeConfigEnd(&iter);
RimeConfigClose(&config);
rime->config_end(&iter);
rime->config_close(&config);
return is_save;
}

Expand Down Expand Up @@ -439,16 +440,17 @@ Java_com_osfans_trime_core_Rime_getRimeConfigMap(JNIEnv *env, jclass clazz,
extern "C" JNIEXPORT jboolean JNICALL
Java_com_osfans_trime_core_Rime_runRimeTask(JNIEnv *env, jclass /* thiz */,
jstring task_name) {
auto rime = rime_get_api();
const char *s = env->GetStringUTFChars(task_name, nullptr);
RimeConfig config = {nullptr};
Bool b = RimeRunTask(s);
Bool b = rime->run_task(s);
env->ReleaseStringUTFChars(task_name, s);
return b;
}
extern "C" JNIEXPORT jstring JNICALL
Java_com_osfans_trime_core_Rime_getRimeSharedDataDir(JNIEnv *env,
jclass /* thiz */) {
return env->NewStringUTF(RimeGetSharedDataDir());
return env->NewStringUTF(rime_get_api()->get_shared_data_dir());
}

extern "C" JNIEXPORT jstring JNICALL
Expand All @@ -459,12 +461,12 @@ Java_com_osfans_trime_core_Rime_getRimeUserDataDir(JNIEnv *env,

extern "C" JNIEXPORT jstring JNICALL
Java_com_osfans_trime_core_Rime_getRimeSyncDir(JNIEnv *env, jclass /* thiz */) {
return env->NewStringUTF(RimeGetSyncDir());
return env->NewStringUTF(rime_get_api()->get_sync_dir());
}

extern "C" JNIEXPORT jstring JNICALL
Java_com_osfans_trime_core_Rime_getRimeUserId(JNIEnv *env, jclass /* thiz */) {
return env->NewStringUTF(RimeGetUserId());
return env->NewStringUTF(rime_get_api()->get_user_id());
}

extern "C" JNIEXPORT jstring JNICALL
Expand Down
Loading