feat(rime_api): get candidate list from index

rime · Feb 19, 2019 · c587900 · c587900 · osfans · Feb 20, 2019
1 parent 667da57
commit c587900
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/rime_api.cc b/src/rime_api.cc
@@ -389,8 +389,9 @@ RIME_API Bool RimeFreeStatus(RimeStatus* status) {
 
 // Accessing candidate list
 
-RIME_API Bool RimeCandidateListBegin(RimeSessionId session_id,
-                                     RimeCandidateListIterator* iterator) {
+RIME_API Bool RimeCandidateListFromIndex(RimeSessionId session_id,
+                                         RimeCandidateListIterator* iterator,
+                                         int index) {
   if (!iterator)
     return False;
   an<Session> session(Service::instance().GetSession(session_id));
@@ -401,10 +402,15 @@ RIME_API Bool RimeCandidateListBegin(RimeSessionId session_id,
     return False;
   memset(iterator, 0, sizeof(RimeCandidateListIterator));
   iterator->ptr = ctx->composition().back().menu.get();
-  iterator->index = -1;
+  iterator->index = index - 1;
   return True;
 }
 
+RIME_API Bool RimeCandidateListBegin(RimeSessionId session_id,
+                                     RimeCandidateListIterator* iterator) {
+  return RimeCandidateListFromIndex(session_id, iterator, 0);
+}
+
 RIME_API Bool RimeCandidateListNext(RimeCandidateListIterator* iterator) {
   if (!iterator)
     return False;
@@ -1054,6 +1060,7 @@ RIME_API RimeApi* rime_get_api() {
     s_api.candidate_list_begin = &RimeCandidateListBegin;
     s_api.candidate_list_next = &RimeCandidateListNext;
     s_api.candidate_list_end = &RimeCandidateListEnd;
+    s_api.candidate_list_from_index = &RimeCandidateListFromIndex;
   }
   return &s_api;
 }
diff --git a/src/rime_api.h b/src/rime_api.h
@@ -259,10 +259,12 @@ RIME_API Bool RimeGetStatus(RimeSessionId session_id, RimeStatus* status);
 RIME_API Bool RimeFreeStatus(RimeStatus* status);
 
 // Accessing candidate list
-
 RIME_API Bool RimeCandidateListBegin(RimeSessionId session_id, RimeCandidateListIterator* iterator);
 RIME_API Bool RimeCandidateListNext(RimeCandidateListIterator* iterator);
 RIME_API void RimeCandidateListEnd(RimeCandidateListIterator* iterator);
+RIME_API Bool RimeCandidateListFromIndex(RimeSessionId session_id,
+                                         RimeCandidateListIterator* iterator,
+                                         int index);
 
 // Runtime options
 
@@ -518,6 +520,9 @@ typedef struct rime_api_t {
   // access config files in user data directory, eg. user.yaml and installation.yaml
   Bool (*user_config_open)(const char *config_id, RimeConfig* config);
 
+  Bool (*candidate_list_from_index)(RimeSessionId session_id,
+                                    RimeCandidateListIterator* iterator,
+                                    int index);
 } RimeApi;
 
 //! API entry