Save initial input configuration

Author: naokiri

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(fcitx5-cskk VERSION 0.1.0)
+project(fcitx5-cskk VERSION 0.2.0-dev)
 set(CMAKE_CXX_STANDARD 20)
 
 find_package(ECM 1.0.0 REQUIRED)

src/cskk.cpp

@@ -13,6 +13,7 @@
  */
 #include "cskk.h"
 #include <cstdlib>
+#include <fcitx-config/iniparser.h>
 #include <fcitx-utils/log.h>
 #include <fcitx/addonmanager.h>
 #include <fcitx/inputpanel.h>
@@ -32,7 +33,7 @@ FCITX_DEFINE_LOG_CATEGORY(cskk_log, "cskk");
 /*******************************************************************************
  * CskkEngine
  ******************************************************************************/
-
+const string CskkEngine::config_file_path = "conf/fcitx5-cskk";
 CskkEngine::CskkEngine(Instance *instance)
     : instance_{instance}, factory_([this](InputContext &ic) {
         auto newCskkContext = new FcitxCskkContext(this, &ic);
@@ -49,7 +50,7 @@ void CskkEngine::keyEvent(const InputMethodEntry &, KeyEvent &keyEvent) {
   auto ic = keyEvent.inputContext();
   auto context = ic->propertyFor(&factory_);
   context->keyEvent(keyEvent);
-  CSKK_DEBUG() << "CSKK Engine keyEvent end";
+  CSKK_DEBUG() << "Engine keyEvent end";
 }
 void CskkEngine::save() {}
 void CskkEngine::activate(const InputMethodEntry &, InputContextEvent &) {}
@@ -69,10 +70,13 @@ void CskkEngine::reset(const InputMethodEntry &entry,
 void CskkEngine::setConfig(const RawConfig &config) {
   CSKK_DEBUG() << "Cskk setconfig";
   config_.load(config, true);
-  // TODO: Save. Any file name convention etc?
+  safeSaveAsIni(config_, CskkEngine::config_file_path);
+  reloadConfig();
 }
 void CskkEngine::reloadConfig() {
   CSKK_DEBUG() << "Cskkengine reload config";
+  readAsIni(config_, CskkEngine::config_file_path);
+
   loadDictionary();
   if (factory_.registered()) {
     instance_->inputContextManager().foreach ([this](InputContext *ic) {
@@ -175,6 +179,7 @@ void CskkEngine::freeDictionaries() {
 FcitxCskkContext::FcitxCskkContext(CskkEngine *engine, InputContext *ic)
     : context_(skk_context_new(nullptr, 0)), ic_(ic), engine_(engine) {
   CSKK_DEBUG() << "Cskk context new";
+  skk_context_set_input_mode(context_, *engine_->config().inputMode);
 }
 FcitxCskkContext::~FcitxCskkContext() = default;
 void FcitxCskkContext::keyEvent(KeyEvent &keyEvent) {
@@ -235,6 +240,11 @@ void FcitxCskkContext::applyConfig() {
   skk_context_set_dictionaries(context_, engine_->dictionaries().data(),
                                engine_->dictionaries().size());
 }
+void FcitxCskkContext::copyTo(InputContextProperty *context) {
+  auto otherContext = dynamic_cast<FcitxCskkContext *>(context);
+  skk_context_set_input_mode(otherContext->context(),
+                             skk_context_get_input_mode(context_));
+}
 
 /*******************************************************************************
  * CskkFactory

src/cskk.h

@@ -50,7 +50,7 @@ struct InputModeAnnotation : public EnumAnnotation {
 FCITX_CONFIGURATION(
     CskkConfig,
     OptionWithAnnotation<InputMode, InputModeAnnotation> inputMode{
-        this, "InitialInputMode", _("InitialInputMode. Fake yet."), Hiragana};
+        this, "InitialInputMode", _("InitialInputMode"), Hiragana};
     Option<bool> showAnnotation{this, "ShowAnnotation",
                                 _("Show Annotation. Fake yet."), true};);
 
@@ -71,14 +71,18 @@ class CskkEngine final : public InputMethodEngine {
   const Configuration *getConfig() const override { return &config_; }
   void setConfig(const RawConfig &config) override;
   void reloadConfig() override;
+
   const auto &dictionaries() { return dictionaries_; }
+  const auto &config() { return config_; }
 
 private:
   Instance *instance_;
   FactoryFor<FcitxCskkContext> factory_;
   CskkConfig config_;
   std::vector<CskkDictionaryFfi *> dictionaries_;
 
+  static const std::string config_file_path;
+
   void loadDictionary();
   static std::string getXDGDataHome();
   static std::vector<std::string> getXDGDataDirs();
@@ -90,13 +94,17 @@ class FcitxCskkContext final : public InputContextProperty {
 public:
   FcitxCskkContext(CskkEngine *engine, InputContext *ic);
   ~FcitxCskkContext() override;
+  // Copy used for sharing state among programs
+  void copyTo(InputContextProperty *state) override;
+
   void keyEvent(KeyEvent &keyEvent);
   void commitPreedit();
   void reset();
   void updateUI();
-
   void applyConfig();
 
+  auto &context() { return context_; }
+
 private:
   // TODO: unique_ptr using some wrapper class for Rust exposed pointer? Need
   // bit more research.