Alhamdulillah. Be less restrictive when saving users selection. (#41)

This also fixes a bug which I faced when saving a selection.

src/engine/ibus/ibus_engine.cpp

@@ -106,7 +106,7 @@ void ibus_commit() {
     std::string candidate = suggestions.candidates[candidateSel];
     IBusText *txt = ibus_text_new_from_string((gchar*)candidate.c_str());
     ibus_engine_commit_text(engine,txt);
-    gLayout->candidateCommited(candidate);
+    gLayout->candidateCommited(candidateSel);
   }
   ibus_reset();
   candidateSel = 0;

src/engine/libengine/Layout.cpp

@@ -113,8 +113,8 @@ bool Layout::handledKeyPress() {
   return mth->handledKeyPress();
 }
 
-void Layout::candidateCommited(std::string commited) {
-  mth->candidateCommited(commited);
+void Layout::candidateCommited(int index) {
+  mth->candidateCommited(index);
 }
 
 bool Layout::isCandidateWinHorizontal() {

src/engine/libengine/Layout.h

@@ -81,9 +81,9 @@ class LayoutMth {
   virtual Suggestion getCandidates() = 0;
   /* Is the last key was processed? */
   virtual bool handledKeyPress() = 0;
-  /* Confirms that one of the sended candidates has been commited
-   * @commited the string that was commited */
-  virtual void candidateCommited(std::string commited) = 0;
+  /* Confirms that one of the send candidates has been commited
+   * @index index of the candidate string that was commited */
+  virtual void candidateCommited(int index) = 0;
   /* Update internal suggestion making mechanism */
   virtual void updateEngine() = 0;
 };
@@ -123,9 +123,9 @@ class Layout {
   IMCommand handleSpecialKey(int key);
   /* Is the last key was processed? */
   bool handledKeyPress();
-  /* Confirms that one of the sended candidates has been commited
-   * @lcommited the string that was commited */
-  void candidateCommited(std::string commited);
+  /* Confirms that one of the send candidates has been commited
+   * @index index of the candidate string that was commited */
+  void candidateCommited(int index);
   /* Checks is the candidate window horizontal */
   bool isCandidateWinHorizontal();
   /* Update internal suggestion making mechanism */

src/engine/libengine/MethodFixedLayoutModern.cpp

@@ -330,7 +330,7 @@ bool MethodFixedLayoutModern::handledKeyPress() {
   return handledKey;
 }
 
-void MethodFixedLayoutModern::candidateCommited(std::string commited) {
+void MethodFixedLayoutModern::candidateCommited(int index) {
   // Clear cache & stored suggestion
   BengaliT = "";
   suggest = {};

src/engine/libengine/MethodFixedLayoutModern.h

@@ -43,7 +43,7 @@ class MethodFixedLayoutModern : public LayoutMth {
   IMCommand handleSpecialKey(int key);
   Suggestion getCandidates();
   bool handledKeyPress();
-  void candidateCommited(std::string commited);
+  void candidateCommited(int index);
 
   void updateEngine() {
     // Nothing to do :)

src/engine/libengine/MethodPhonetic.cpp

@@ -16,8 +16,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#include "im.h"
-#include "log.h"
 #include "keycode.h"
 #include "MethodPhonetic.h"
 #include "Settings.h"
@@ -39,12 +37,9 @@ Suggestion MethodPhonetic::createSuggestion() {
   if(EnglishT == "") {
     // If there is no text available, don't do anything
     return {};
-  } else {/*
-    if(changedCandidateSelection) {
-      // User selected other candidate, save current selection
-      suggest.saveSelection(QString::fromStdString(im_get_selection(im_get_selection_id())));
-      changedCandidateSelection = false;
-    }*/
+  } else {
+    // Reset
+    changedCandidateSelection = false;
 
     // Build the suggestions
     list = suggest.Suggest(EnglishT).toVector();
@@ -689,10 +684,10 @@ bool MethodPhonetic::handledKeyPress() {
   return handledKey;
 }
 
-void MethodPhonetic::candidateCommited(std::string commited) {
+void MethodPhonetic::candidateCommited(int index) {
   if(changedCandidateSelection) {
     // User selected other candidates
-    suggest.saveSelection(QString::fromStdString(commited));
+    suggest.saveSelection(index);
     changedCandidateSelection = false;
   }
   // Clear cache & stored suggestions

src/engine/libengine/MethodPhonetic.h

@@ -41,7 +41,7 @@ class MethodPhonetic : public LayoutMth {
   IMCommand handleSpecialKey(int key);
   Suggestion getCandidates();
   bool handledKeyPress();
-  void candidateCommited(std::string commited);
+  void candidateCommited(int index);
   void updateEngine();
 };
 

src/engine/libengine/PhoneticSuggestion.cpp

@@ -112,8 +112,7 @@ void PhoneticSuggestion::appendIfNotContains(QStringList &array, QString item) {
 
 void PhoneticSuggestion::addToTempCache(QString full, QString base, QString eng) {
   if (!tempCache.contains(full)) {
-    tempCache[full].base = base;
-    tempCache[full].eng = eng;
+    tempCache[full] = {base, eng};
   }
 }
 
@@ -240,6 +239,8 @@ QStringList PhoneticSuggestion::joinSuggestion(QString writtenWord, QString auto
 
   appendIfNotContains(words, phonetic);
 
+  prevSuggestion << words;
+
   for (auto& word : words) {
     // smiley rule
     if (autoCorrect == writtenWord) {
@@ -254,24 +255,20 @@ QStringList PhoneticSuggestion::joinSuggestion(QString writtenWord, QString auto
   return words;
 }
 
-void PhoneticSuggestion::saveSelection(QString selected) {
-  if (tempCache.contains(selected)) {
-    QString base = tempCache[selected].base;
-    QString eng = tempCache[selected].eng;
-    if(cacheMan.getCandidateSelection(eng) == "") {
-      cacheMan.writeCandidateSelection(eng, base);
-    }
-  }
+void PhoneticSuggestion::saveSelection(int index) {
+  cacheMan.writeCandidateSelection(PadMap["middle"], prevSuggestion[index]);
 }
 
 QStringList PhoneticSuggestion::Suggest(QString word) {
   QStringList suggestion;
   QMap<QString, QString> splitWord = separatePadding(word);
-  PadMap = splitWord;
+  prevSuggestion.clear();
 
   splitWord["begin"] = parser.parse(splitWord["begin"]);
   splitWord["end"] = parser.parse(splitWord["end"]);
 
+  PadMap = splitWord;
+
   QString phonetic = parser.parse(splitWord["middle"]);
 
   if(!gSettings->getShowCWPhonetic()) {

src/engine/libengine/PhoneticSuggestion.h

@@ -33,6 +33,7 @@ class PhoneticSuggestion {
   QMap<QString, QString> PadMap;
   QMap<QString, QStringList> phoneticCache;
   QMap<QString, Cache> tempCache;
+  QStringList prevSuggestion;
 
   QMap<QString, QString> separatePadding(QString word);
   bool isKar(QString word);
@@ -50,7 +51,7 @@ class PhoneticSuggestion {
   void setLayout(QJsonObject lay);
 
   QString getPrevSelected();
-  void saveSelection(QString selected);
+  void saveSelection(int index);
 
   QStringList Suggest(QString word);
   void updateEngine();

src/engine/libengine/cachemanager.cpp

@@ -57,7 +57,7 @@ QString CacheManager::getCandidateSelection(QString word) {
 }
 
 void CacheManager::writeCandidateSelection(QString word, QString sel) {
-  candidateSel[word] = sel;
+  candidateSel.insert(word, sel);
   saveCandidateSelection();
 }
 

src/engine/libengine/cachemanager.h

@@ -36,19 +36,6 @@ class CacheManager {
   void setTempCache(QString key, QVector<QString> suggestions);
   QVector<QString> getTempCache(QString key);
 
-/* TODO: Add Suffix implementation
-  void removeAllBase() {
-    base.clear();
-  }
-
-  QVector<QString> baseForKey(QString key) {
-    return base[key];
-  }
-
-  void setBase(QVector<QString> aBase, QString aKey) {
-    base[aKey] = aBase;
-  }*/
-
   void loadCandidateSelection();
   QString getCandidateSelection(QString word);
   void writeCandidateSelection(QString word, QString sel);