WIP: Show word suggestions/correction according to a dictionary

Author: Julow

srcs/juloo.keyboard2/CurrentlyTypedWord.java

@@ -63,12 +63,13 @@ public void selection_updated(int oldSelStart, int newSelStart, int newSelEnd)
   {
     // Avoid the expensive [refresh_current_word] call when [typed] was called
     // before.
-    boolean new_has_sel = newSelStart != newSelEnd;
-    if (!_enabled || (newSelStart == _cursor && new_has_sel == _has_selection))
-      return;
-    _has_selection = new_has_sel;
-    refresh_current_word();
-    _cursor = newSelStart;
+    return;
+    // boolean new_has_sel = newSelStart != newSelEnd;
+    // if (!_enabled || (newSelStart == _cursor && new_has_sel == _has_selection))
+    //   return;
+    // _has_selection = new_has_sel;
+    // refresh_current_word();
+    // _cursor = newSelStart;
   }
 
   public void event_sent(int code, int meta)

srcs/juloo.keyboard2/Dictionary.java

@@ -0,0 +1,26 @@
+package juloo.keyboard2;
+
+import android.content.res.Resources;
+import java.io.IOException;
+import java.io.InputStream;
+import juloo.cdict.Cdict;
+
+public final class Dictionary
+{
+  public static Cdict main_fr;
+
+  private static boolean inited = false;
+
+  public static void init(Resources res)
+  {
+    if (inited)
+      return;
+    inited = true;
+    try
+    {
+      InputStream input = res.openRawResource(R.raw.main_fr);
+      main_fr = Cdict.of_bytes(input.readAllBytes());
+    }
+    catch (IOException _exn) {}
+  }
+}

srcs/juloo.keyboard2/Keyboard2.java

@@ -113,6 +113,7 @@ KeyboardData loadPinentry(int layout_id)
   public void onCreate()
   {
     super.onCreate();
+    Dictionary.init(getResources());
     SharedPreferences prefs = DirectBootAwarePreferences.get_shared_preferences(this);
     _handler = new Handler(getMainLooper());
     _keyeventhandler = new KeyEventHandler(this.new Receiver());

srcs/juloo.keyboard2/Suggestions.java

@@ -1,29 +1,45 @@
 package juloo.keyboard2;
 
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
+import juloo.cdict.Cdict;
 
 /** Keep track of the word being typed and provide suggestions for
     [CandidatesView]. */
 public final class Suggestions
 {
   Callback _callback;
+  Cdict _dict;
 
   public Suggestions(Callback c)
   {
     _callback = c;
+    _dict = Dictionary.main_fr;
   }
 
   public void currently_typed_word(String word)
   {
-    if (word.equals(""))
+    if (word.length() < 2)
     {
       _callback.set_suggestions(NO_SUGGESTIONS);
     }
     else
     {
-      // TODO
-      _callback.set_suggestions(Arrays.asList(word));
+      Cdict.Result r = _dict.find(word);
+      String[] suggestions = new String[3];
+      int i = 0;
+      if (r.found)
+        suggestions[i++] = word;
+      int[] suffixes = _dict.suffixes(r, 3);
+      int[] dist = _dict.distance(word, 1, 3);
+      for (int j = 0; j < 3 && i < 3; j++)
+      {
+        if (suffixes.length > j)
+          suggestions[i++] = _dict.word(suffixes[j]);
+        if (dist.length > j && i < 3)
+          suggestions[i++] = _dict.word(dist[j]);
+      }
+      _callback.set_suggestions(Arrays.asList(suggestions));
     }
   }