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

update librime #6

Merged
merged 1 commit into from
Jan 3, 2025
Merged

update librime #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion librime
Open in desktop
Submodule librime updated 47 files
+17 −7 README-mac.md
+1 −1 deps/glog
+4 −4 src/rime/algo/algebra.h
+2 −2 src/rime/algo/calculus.h
+3 −3 src/rime/algo/encoder.h
+2 −2 src/rime/algo/syllabifier.h
+1 −1 src/rime/composition.h
+30 −30 src/rime/config/config_component.h
+30 −30 src/rime/config/config_types.h
+1 −1 src/rime/context.h
+2 −2 src/rime/deployer.h
+6 −6 src/rime/dict/corrector.h
+3 −3 src/rime/dict/db.h
+3 −3 src/rime/dict/dict_compiler.h
+8 −8 src/rime/dict/dictionary.h
+2 −2 src/rime/dict/level_db.cc
+1 −1 src/rime/dict/mapped_file.h
+9 −9 src/rime/dict/prism.h
+2 −2 src/rime/dict/string_table.h
+14 −14 src/rime/dict/table.h
+15 −15 src/rime/dict/text_db.h
+1 −1 src/rime/dict/user_db.cc
+5 −5 src/rime/dict/user_db.h
+1 −1 src/rime/dict/vocabulary.h
+1 −1 src/rime/engine.h
+5 −1 src/rime/gear/navigator.cc
+3 −0 src/rime/gear/navigator.h
+6 −6 src/rime/key_event.h
+4 −4 src/rime/key_table.cc
+4 −4 src/rime/key_table.h
+3 −3 src/rime/lever/deployment_tasks.h
+2 −0 src/rime/lever/levers_api_impl.h
+0 −1 src/rime/lever/levers_module.cc
+0 −1 src/rime/lever/levers_stdbool.cc
+1 −1 src/rime/lever/user_dict_manager.h
+4 −4 src/rime/menu.h
+4 −4 src/rime/registry.h
+2 −2 src/rime/resource.h
+1 −1 src/rime/segmentation.h
+1 −1 src/rime/service.h
+6 −6 src/rime/setup.cc
+6 −6 src/rime/setup.h
+1 −1 src/rime/ticket.h
+2 −2 src/rime/translation.h
+3 −2 src/rime_api.cc
+6 −2 src/rime_api.h
+2 −2 src/rime_api_impl.h
16 changes: 8 additions & 8 deletions patches/librime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ index 07aa6b7d..7360e0b5 100644

// implementations
diff --git a/src/rime/engine.h b/src/rime/engine.h
index 2e1c8b81..94a6b500 100644
index 6b51a68e..c5b8f7e4 100644
--- a/src/rime/engine.h
+++ b/src/rime/engine.h
@@ -16,6 +16,7 @@ namespace rime {
Expand All @@ -46,13 +46,13 @@ index 2e1c8b81..94a6b500 100644
@@ -35,6 +36,7 @@ class Engine : public Messenger {
void set_active_engine(Engine* engine = nullptr) { active_engine_ = engine; }

RIME_API static Engine* Create();
RIME_DLL static Engine* Create();
+ an<Switcher> switcher_;

protected:
Engine();
diff --git a/src/rime/gear/navigator.cc b/src/rime/gear/navigator.cc
index c3a63621..4d08745c 100644
index e3c3b40e..551716b2 100644
--- a/src/rime/gear/navigator.cc
+++ b/src/rime/gear/navigator.cc
@@ -15,6 +15,9 @@
Expand All @@ -65,7 +65,7 @@ index c3a63621..4d08745c 100644
namespace rime {

static Navigator::ActionDef navigation_actions[] = {
@@ -72,7 +75,7 @@ ProcessResult Navigator::ProcessKeyEvent(const KeyEvent& key_event) {
@@ -76,7 +79,7 @@ ProcessResult Navigator::ProcessKeyEvent(const KeyEvent& key_event) {
if (!ctx->IsComposing())
return kNoop;
TextOrientation text_orientation =
Expand Down Expand Up @@ -223,7 +223,7 @@ index 5e4bfce0..e88aace0 100644
enum CandidateListLayout {
Stacked = 0,
diff --git a/src/rime/service.h b/src/rime/service.h
index 2b3111af..95ca87dc 100644
index a69ae741..9b3d4b16 100644
--- a/src/rime/service.h
+++ b/src/rime/service.h
@@ -44,11 +44,11 @@ class Session {
Expand All @@ -240,17 +240,17 @@ index 2b3111af..95ca87dc 100644
string commit_text_;
};
diff --git a/src/rime_api_impl.h b/src/rime_api_impl.h
index 7749ce98..b0200a67 100644
index 6e906cfe..f4dae0a3 100644
--- a/src/rime_api_impl.h
+++ b/src/rime_api_impl.h
@@ -15,6 +15,8 @@
@@ -17,6 +17,8 @@
#include <rime/setup.h>
#include <rime/signature.h>
#include <rime/switches.h>
+#include <rime/engine.h>
+#include <rime/switcher.h>

#include "rime_api.h"
using namespace rime;

@@ -426,6 +428,13 @@ RIME_DEPRECATED void RimeSetOption(RimeSessionId session_id,
if (!ctx)
Expand Down
Loading