Merge 743d819 into cad4a6e

chewing · May 23, 2017 · 972f6b2 · 972f6b2
2 parents cad4a6e + 743d819
commit 972f6b2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/include/internal/chewingutil.h b/include/internal/chewingutil.h
@@ -37,6 +37,7 @@ int SymbolChoice(ChewingData *pgdata, int sel_i);
 int HaninSymbolInput(ChewingData *pgdata);
 void WriteChiSymbolToCommitBuf(ChewingData *pgdata, ChewingOutput *pgo, int len);
 int ReleaseChiSymbolBuf(ChewingData *pgdata, ChewingOutput *);
+void ResetOldChiSymbolCursor(ChewingData *pgdata);
 int AddChi(uint16_t phone, uint16_t phoneAlt, ChewingData *pgdata);
 int CallPhrasing(ChewingData *pgdata, int all_phrasing);
 int MakeOutputWithRtn(ChewingOutput *pgo, ChewingData *pgdata, int keystrokeRtn);

diff --git a/src/chewingio.c b/src/chewingio.c
@@ -1625,6 +1625,7 @@ CHEWING_API int chewing_handle_Default(ChewingContext *ctx, int key)
   End_KeyDefault:
     CallPhrasing(pgdata, 0);
   End_Paging:
+    ResetOldChiSymbolCursor(pgdata);
     MakeOutputWithRtn(pgo, pgdata, keystrokeRtn);
     return 0;
 }

diff --git a/src/chewingutil.c b/src/chewingutil.c
@@ -529,6 +529,12 @@ int ReleaseChiSymbolBuf(ChewingData *pgdata, ChewingOutput *pgo)
     return throwEnd;
 }
 
+/* Sync the oldChiSymbolCursor after choice */
+void ResetOldChiSymbolCursor(ChewingData *pgdata)
+{
+    pgdata->choiceInfo.oldChiSymbolCursor = pgdata->chiSymbolCursor;
+}
+
 static int ChewingIsBreakPoint(int cursor, ChewingData *pgdata)
 {
     static const char *const BREAK_WORD[] = {

diff --git a/src/choice.c b/src/choice.c
@@ -517,6 +517,10 @@ int ChoiceNextAvail(ChewingData *pgdata)
     return 0;
 }
 
+/* TODO:
+**     Distinguish in what situation the chiSymbolCursor should be
+** reset to the oldChiSymbolCursor
+*/
 int ChoiceEndChoice(ChewingData *pgdata)
 {
     pgdata->bSelect = 0;